Skip to content

fix: include collaborator hours and Vault awards in lifetime RE and payouts - #197

Merged
0xQuerencia merged 6 commits into
mainfrom
fix/count-collaborator-and-vault-restoration-energy
Nov 9, 2026
Merged

0xQuerencia merged 6 commits into
mainfrom
fix/count-collaborator-and-vault-restoration-energy

Conversation

@0xQuerencia

Copy link
Copy Markdown
Collaborator

Confirmed inconsistencies

  • PIXL documents that every accepted collaborator banks their own RE, but both server and reviewer dashboard lifetimeRe() only counted project owners. Collaborator hours were paid in pixels on approval but did not increase later rates or levels.
  • The game server includes vault_chapter_awards.re_awarded in lifetime RE, while the internal reviewer dashboard omitted them. This could understate review-time pixel payouts.

Fix

  • Add earnedCollaboratorHours using the collaborator's approved/prior-approved hours, not the project owner's or unapproved Hackatime hours.
  • Add approved collaboration rows to both server and dashboard lifetime RE, including historical removed collaborators who already earned approved work. Exclude the current project during rate calculations and avoid double-counting owner rows.
  • Include flat Vault RE awards in the dashboard's lifetimeRe() to match the game server.
  • Update server approvedHoursFor(), totalCommunityRe(), and communityEnergy() to include collaborator contributions consistently.
  • Add unit regression tests in both independently built apps for approved collaborators, pending first approvals, and update review cycles.

Production observations (read-only)

  • 7 accepted collaborator rows with approved hours on approved projects.
  • 6 Vault award rows totaling 1,100 RE.
    No wallet balances or production data were changed.

Scope

This changes future payout-rate calculations and live RE display/community counters. It does not retroactively reprice historical payouts or issue refunds automatically. RE on a collaboration is based on approved hours at the project's tier, without an additional Trial-prize bonus (the owner's separate Trial bonus does not apply to collaborators).

Tests and CI pending.

Copilot AI balanced review requested due to automatic review settings November 9, 2026 19:24

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

@0xQuerencia
0xQuerencia merged commit ed04c1e into main Nov 9, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants