Spekulaas/Blockchain_School
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added fees to mining reward

Browse Source
This commit is contained in:
Ryan Bakkes 2023-11-11 11:54:42 +01:00
parent ded8b0f1f7
commit ed41cde4c2
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
goodchain/src/classes/Transaction.py
View File

@ -104,9 +104,11 @@ class Tx:
self.add_reqd(reqd) self.add_reqd(reqd)
self.sign(private_ser) self.sign(private_ser)
def createRewardTransaction(self, public_ser, private_ser, type): def createRewardTransaction(self, public_ser, private_ser, type, fee = 0):
value = type == "MINE" and MINE_REWARD_VALUE or REGISTRATION_REWARD_VALUE if type == "MINE":
self.add_output(public_ser, value) self.add_output(public_ser, MINE_REWARD_VALUE + fee)
else:
self.add_output(public_ser, REGISTRATION_REWARD_VALUE)
self.type = REWARD self.type = REWARD
self.sign(private_ser) self.sign(private_ser)

15
goodchain/src/helpers/BlockHelper.py
View File

@ -132,9 +132,10 @@ def createBlock(self):
fees[x] = transaction.inputs[0][1] - transaction.outputs[0][1] fees[x] = transaction.inputs[0][1] - transaction.outputs[0][1]
x+=1 x+=1
print(fees)
fees_list = list(fees.keys()) fees_list = list(fees.keys())
selected_transactions = fees_list[-2:] selected_transactions = fees_list[:2]
available_transactions = fees_list[:-2] available_transactions = fees_list[2:]
# print fees with values and keys if key is in available_transactions # print fees with values and keys if key is in available_transactions
for key, value in fees.items(): for key, value in fees.items():
@ -261,8 +262,16 @@ def validateMinedBlock(self):
if new_block.metadata['true_validations'] >= 3: if new_block.metadata['true_validations'] >= 3:
new_block.metadata['validated'] = True new_block.metadata['validated'] = True
# get fees from transactions in block
fees = 0
for transaction in new_block.data:
if transaction.type != 1:
fees += transaction.inputs[0][1] - transaction.outputs[0][1]
new_reward = Tx() new_reward = Tx()
new_reward.createRewardTransaction(self.user.public_ser, self.user.private_ser, "MINE") new_reward.createRewardTransaction(self.user.public_ser, self.user.private_ser, "MINE", fees)
utilityHelper.saveFile("../data/transaction_pool.dat", new_reward)
try: try:
del blocks[-1] del blocks[-1]