Skip to content

phillips #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phillip0726 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

phillips #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions mining.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ def mineStart(cls):
print('target difficulty :', target_diff)

candidate_block = get_candidateblock()
#print(candidate_block.block_index, candidate_block.block_hash, candidate_block.previous_block, candidate_block.merkle_root,
# candidate_block.difficulty)

blockData = str(candidate_block.previous_block) + \
str(candidate_block.merkle_root) + \
Expand Down Expand Up @@ -96,6 +94,23 @@ def mineStart(cls):
print("False")

# Add to UTXOsets and myUTXOsets(for coinbase transaction only)

tx_length=candidate_block.tx_set.length()
for i in range(tx_length):
tx=candidate_block.tx_set[i]
tx_id=tx.tx_id

for j in range(tx.in_num):
vin=tx.vin[j]
UTXOset.Pop_UTXO(vin.tx_id, vin.index)
UTXOset.Pop_myUTXO(vin.tx_id, vin.index)
for j in range(tx.out_num):
vout=tx.vout[j]
UTXOset.Insert_UTXO(tx_id, j, vout.lock, vout.value)
address_str=base64.b64encode(vout.lock).decode('utf-8')
if address_str==Key._publicKey:
UTXOset.Insert_myUTXO(tx_id,j,vout.lock,vout.value)
"""
coinbase = candidate_block.tx_set[0]
coinbase_data = coinbase.vout[0]
coinbase_tx_id = coinbase.tx_id
Expand All @@ -109,6 +124,7 @@ def mineStart(cls):
0,
coinbase_data.lock,
coinbase_data.value)
"""

# Delete from MemoryPool
for tx in candidate_block.tx_set:
Expand Down