Skip to content
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

Deploy to mainnet #2419

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Deploy to mainnet #2419

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca1396
fix: refactor mining_reward calculate (#2417)
zmcNotafraid Feb 4, 2025
b751ae3
Merge pull request #2418 from nervosnetwork/develop
zmcNotafraid Feb 4, 2025
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
6 changes: 5 additions & 1 deletion app/models/daily_statistic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,11 @@ def liquidity
end

define_logic :mining_reward do
Block.created_before(ended_at).sum(:secondary_reward)
if from_scratch
Block.created_before(ended_at).sum(:secondary_reward)
else
Block.created_between(started_at, ended_at).sum(:secondary_reward) + yesterday_daily_statistic.mining_reward.to_i
end
end

define_logic :deposit_compensation do
Expand Down