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

Jump to bottom

Bugfix/treasury update target epoch #198

Merged
merged 4 commits into from
Jul 19, 2019
Merged

Bugfix/treasury update target epoch #198

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcc0b99
add chain id check to update endblocker only for columbus-2
Jun 24, 2019
490acea
move chain-id check to update module
Jun 25, 2019
704fdea
Merge branch 'bugfix/update-230000-only-for-columbus-2' into develop
Jun 25, 2019
8665c2b
change treasury endblocker upate target to next epoch
Jul 5, 2019
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
4 changes: 2 additions & 2 deletions x/treasury/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func updateTaxPolicy(ctx sdk.Context, k Keeper) (newTaxRate sdk.Dec) {
newTaxRate = params.TaxPolicy.Clamp(oldTaxRate, newTaxRate)

// Set the new tax rate to the store
k.SetTaxRate(ctx, newTaxRate)
k.SetTaxRate(ctx.WithBlockHeight(ctx.BlockHeight()+1), newTaxRate)
return
}

Expand All @@ -52,6 +52,6 @@ func updateRewardPolicy(ctx sdk.Context, k Keeper) (newRewardWeight sdk.Dec) {
newRewardWeight = params.RewardPolicy.Clamp(oldWeight, newRewardWeight)

// Set the new reward weight
k.SetRewardWeight(ctx, newRewardWeight)
k.SetRewardWeight(ctx.WithBlockHeight(ctx.BlockHeight()+1), newRewardWeight)
return
}