From a15cdce0c0894ae4ad352b39546cee511bfd2005 Mon Sep 17 00:00:00 2001 From: spekulaas Date: Thu, 9 Nov 2023 09:03:57 +0100 Subject: [PATCH] added balance check --- goodchain/src/helpers/MenuHelper.py | 3 ++- goodchain/src/helpers/TaskHelper.py | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/goodchain/src/helpers/MenuHelper.py b/goodchain/src/helpers/MenuHelper.py index 022e343..016574a 100644 --- a/goodchain/src/helpers/MenuHelper.py +++ b/goodchain/src/helpers/MenuHelper.py @@ -153,7 +153,8 @@ class MenuHelper: print("TODO") case "Check balance": - taskHelper.getBalance(self) + print(f"Your balance is: {taskHelper.getBalance(self)}") + case "Check the pool": transactions = utilityHelper.loadFile("../data/transaction_pool.dat") diff --git a/goodchain/src/helpers/TaskHelper.py b/goodchain/src/helpers/TaskHelper.py index 09508bd..f4cccd7 100644 --- a/goodchain/src/helpers/TaskHelper.py +++ b/goodchain/src/helpers/TaskHelper.py @@ -22,7 +22,7 @@ def transaction(self): return False try: - amount = int(amount) + amount = float(amount) except: print("Wrong input, try again") return False @@ -32,10 +32,18 @@ def transaction(self): return False try: - fee = int(fee) + fee = float(fee) except: print("Wrong input, try again") return False + + utilityHelper.clearScreen() + + print(f"Processing transaction of {amount + fee} coins, {receiver} will receive {amount} coins") + + if amount + fee > getBalance(self): + print("You dont have enough money") + return False new_tx = Tx() new_tx.createTransaction(self.user.public_ser, self.user.private_ser, amount, fee, receiver_data[1]) @@ -194,5 +202,4 @@ def getBalance(self): balance += transaction.outputs[0][1] elif transaction.inputs[0][0] == self.user.public_ser: balance -= transaction.inputs[0][1] - print(f"Your balance is: {balance}") return balance \ No newline at end of file