blackroad-os/blackroad-operating-system
9
0
Fork 0
mirror of https://github.com/blackboxprogramming/BlackRoad-Operating-System.git synced 2026-03-17 07:57:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix miner wallet queries and add tests

Browse Source
This commit is contained in:
Alexa Amundson
2025-11-16 01:50:36 -06:00
parent b2f933762a
commit b2379fddd7
6 changed files with 188 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
backend/app/routers/miner.py
View File

@@ -138,22 +138,37 @@ async def get_miner_stats(
)
wallet = wallet_result.scalar_one_or_none()
if not wallet:
return MinerStats(
blocks_mined=0,
roadcoins_earned=0.0,
current_hashrate_mhs=miner_state.hashrate_mhs if miner_state.is_mining else 0.0,
average_hashrate_mhs=0.0,
total_shares=miner_state.shares_submitted,
accepted_shares=miner_state.shares_accepted,
rejected_shares=miner_state.shares_submitted - miner_state.shares_accepted,
last_block_time=None,
mining_since=miner_state.started_at,
)
miner_filter = Block.miner_address == wallet.address
# Count blocks mined by this user
blocks_count_result = await db.execute(
select(func.count(Block.id)).filter(Block.miner == wallet.address if wallet else None)
select(func.count(Block.id)).filter(miner_filter)
)
blocks_mined = blocks_count_result.scalar() or 0
# Sum rewards earned
rewards_result = await db.execute(
select(func.sum(Block.reward)).filter(Block.miner == wallet.address if wallet else None)
select(func.sum(Block.reward)).filter(miner_filter)
)
roadcoins_earned = rewards_result.scalar() or 0.0
# Get last block mined
last_block_result = await db.execute(
select(Block)
.filter(Block.miner == wallet.address if wallet else None)
.filter(miner_filter)
.order_by(desc(Block.timestamp))
.limit(1)
)
@@ -197,7 +212,7 @@ async def get_recent_blocks(
# Get recent blocks
blocks_result = await db.execute(
select(Block)
.filter(Block.miner == wallet.address)
.filter(Block.miner_address == wallet.address)
.order_by(desc(Block.timestamp))
.limit(limit)
)