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

Merge released refs/heads/master into develop #1506

Merged
merged 14 commits into from
Nov 24, 2023
Merged

Merge released refs/heads/master into develop #1506

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5aba20e
Merge pull request #1473 from nervosnetwork/develop
zmcNotafraid Oct 20, 2023
a663d3c
Merge pull request #1478 from nervosnetwork/testnet
zmcNotafraid Oct 20, 2023
1ef0d40
Merge pull request #1479 from nervosnetwork/develop
zmcNotafraid Oct 23, 2023
9119781
Merge pull request #1485 from nervosnetwork/testnet
zmcNotafraid Oct 23, 2023
5003653
Merge pull request #1487 from nervosnetwork/develop
rabbitz Nov 6, 2023
9ccfdd4
Merge pull request #1492 from nervosnetwork/testnet
rabbitz Nov 6, 2023
49ecfd4
Merge pull request #1494 from nervosnetwork/develop
rabbitz Nov 7, 2023
1fefe97
Merge pull request #1495 from nervosnetwork/testnet
rabbitz Nov 7, 2023
88e2ac8
Merge pull request #1497 from nervosnetwork/develop
rabbitz Nov 18, 2023
2f06417
feat: adjust halving miner reward (#1505)
zmcNotafraid Nov 19, 2023
8a85d88
Merge pull request #1508 from nervosnetwork/develop
rabbitz Nov 20, 2023
dacdb42
Merge pull request #1510 from nervosnetwork/develop
zmcNotafraid Nov 20, 2023
30ae902
Fix conflict with testnet branch
zmcNotafraid Nov 20, 2023
f7a912f
Merge pull request #1511 from zmcNotafraid/fix-conflict-with-testnet
zmcNotafraid Nov 20, 2023
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
2 changes: 1 addition & 1 deletion app/utils/ckb_utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def self.base_reward(block_number, epoch_number)
end

def self.epoch_reward_with_halving(epoch_number)
Settings.default_epoch_reward.to_i >> epoch_number / HALVING_EPOCH
Settings.default_epoch_reward.to_i >> epoch_number / HALVING_EPOCH
end

def self.primary_reward(block_number, block_economic_state)
Expand Down