Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion api/dbv1/get_undisbursed_challenges.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/dbv1/queries/get_undisbursed_challenges.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ SELECT
users.handle,
users.wallet,
user_challenges.challenge_id,
user_challenges.specifier
user_challenges.specifier,
user_challenges.amount
FROM user_challenges
JOIN users ON users.user_id = user_challenges.user_id
LEFT JOIN challenge_disbursements
Expand Down
12 changes: 9 additions & 3 deletions api/v1_claim_rewards.go
Original file line number Diff line number Diff line change
Expand Up @@ -801,19 +801,25 @@ func (app *ApiServer) v1ClaimRewards(c *fiber.Ctx) error {
Specifier: row.Specifier,
}

reward, err := getReward(row.ChallengeID, app.rewardAttester.Rewards)
_, err := getReward(row.ChallengeID, app.rewardAttester.Rewards)
if err != nil {
results[i].Error = err.Error()
g.Done()
return
}

results[i].Amount = reward.Amount
// Use the per-challenge amount from user_challenges (set when the
// challenge was dispatched), not the static config reward.Amount.
// Trending tt/tut challenges pay rank-dependent amounts (e.g. 1000
// for ranks 1-5 and 100 for ranks 6-10) that the static reward
// config can't represent.
amount := uint64(row.Amount)
results[i].Amount = amount

rewardClaim := RewardClaim{
RewardClaim: rewards.RewardClaim{
RewardID: row.ChallengeID,
Amount: reward.Amount,
Amount: amount,
Specifier: row.Specifier,
RecipientEthAddress: row.Wallet.String,
ClaimAuthority: antiAbuseOracle.DelegateWallet,
Expand Down
Loading