Omnibus commited on
Commit
4bfbc30
·
1 Parent(s): 55e7ac1

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +12 -9
app.py CHANGED
@@ -310,24 +310,27 @@ def mychain_mine_block_rec(balance, chain_r=None,chain_n=None):
310
  def merge_trans():
311
  trans_bx = []
312
  previous_post_send = mychain_send.print_previous_block()
 
313
 
314
  send_block = {
315
- 'name': previous_post_send['transactions'][0]['sender']
 
316
  'index': previous_post_send['index'],
317
  'timestamp': previous_post_send['timestamp'],
318
  'recipient': previous_post_send['transactions'][0]['recipient'],
319
  'amount': previous_post_send['transactions'][0]['amount'],
320
  'balance': previous_post_send['balance'],
321
  'proof': previous_post_send['proof'],
322
- 'previous_hash': previous_post['previous_hash']}
323
  rec_block = {
324
- 'name': previous_post_send['transactions'][0]['recipient']
325
- 'index': previous_post['index'],
326
- 'timestamp': previous_post['timestamp'],
327
- 'sender': previous_post['transactions'][0]['sender'],
328
- 'amount': previous_post['transactions'][0]['amount'],
329
- 'balance': previous_post['balance'],
330
- 'proof': previous_post['proof'],
 
331
  'previous_hash': previous_post['previous_hash']}
332
  trans_bx.append(send_block)
333
  trans_bx.append(rec_block)
 
310
  def merge_trans():
311
  trans_bx = []
312
  previous_post_send = mychain_send.print_previous_block()
313
+ previous_post_rec = mychain_rec.print_previous_block()
314
 
315
  send_block = {
316
+ 'role': 'Sender',
317
+ 'name': previous_post_send['transactions'][0]['sender'],
318
  'index': previous_post_send['index'],
319
  'timestamp': previous_post_send['timestamp'],
320
  'recipient': previous_post_send['transactions'][0]['recipient'],
321
  'amount': previous_post_send['transactions'][0]['amount'],
322
  'balance': previous_post_send['balance'],
323
  'proof': previous_post_send['proof'],
324
+ 'previous_hash': previous_post_send['previous_hash']}
325
  rec_block = {
326
+ 'role': 'Recipient',
327
+ 'name': previous_post_rec['transactions'][0]['recipient'],
328
+ 'index': previous_post_rec['index'],
329
+ 'timestamp': previous_post_rec['timestamp'],
330
+ 'sender': previous_post_rec['transactions'][0]['sender'],
331
+ 'amount': previous_post_rec['transactions'][0]['amount'],
332
+ 'balance': previous_post_rec['balance'],
333
+ 'proof': previous_post_rec['proof'],
334
  'previous_hash': previous_post['previous_hash']}
335
  trans_bx.append(send_block)
336
  trans_bx.append(rec_block)