This repository has been archived by the owner on Aug 19, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 184
kip162: enable gasTip and add tip to total reward #2187
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yoomee1313
force-pushed
the
tip-for-kip162
branch
from
May 23, 2024 07:47
9c79b7e
to
2dc9353
Compare
blukat29
reviewed
May 23, 2024
yoomee1313
requested review from
ian0371,
hyeonLewis,
hyunsooda,
2dvorak,
kjeom,
JayChoi1736,
sjnam and
aidan-kwon
as code owners
May 23, 2024 09:18
yoomee1313
force-pushed
the
tip-for-kip162
branch
from
May 23, 2024 10:37
b97d8fe
to
70dbf79
Compare
Co-authored-by: Yunjong Jeong (ollie) <[email protected]>
hyeonLewis
reviewed
May 24, 2024
@yoomee1313 Please enable the supply manager test with KIP-162 settings. I've checked it works. diff --git a/reward/supply_manager_test.go b/reward/supply_manager_test.go
index a4e13db48..32ec05cfe 100644
--- a/reward/supply_manager_test.go
+++ b/reward/supply_manager_test.go
@@ -372,7 +372,7 @@ func (s *SupplyTestSuite) SetupSuite() {
KoreCompatibleBlock: big.NewInt(200),
ShanghaiCompatibleBlock: big.NewInt(300),
CancunCompatibleBlock: big.NewInt(300),
- // KaiaCompatibleBlock: big.NewInt(300), // TODO: uncomment
+ KaiaCompatibleBlock: big.NewInt(300),
Kip103CompatibleBlock: big.NewInt(200),
Kip103ContractAddress: addrKip103,
@@ -473,7 +473,7 @@ func (s *SupplyTestSuite) testcases() []supplyTestTC {
var (
halfFee = big.NewInt(262500000000000) // Magma burn amount (gasPrice=50, baseFee=25 -> effectivePrice=25)
fullFee = big.NewInt(525000000000000) // Kore burn amount (gasPrice=50, baseFee=25 -> effectivePrice=25)
- // withTip = big.NewInt(283500000000000) // Kaia burn amount (gasPrice=27, baseFee=25 -> effectivePrice=27)
+ withTip = big.NewInt(567000000000000) // Kaia burn amount (gasPrice=27, baseFee=25 -> effectivePrice=27)
// Fund1 has 769254566500000000000, Fund2 has 178056862000000000000 at block 199 but burnt
// Fund1 get 1280000000000000000, Fund2 get 1920000000000000000 at block 200 minted from reward but burnt
@@ -512,7 +512,7 @@ func (s *SupplyTestSuite) testcases() []supplyTestTC {
}
for i := uint64(300); i <= 400; i++ {
minted[i] = bigAdd(minted[i-1], amount80)
- burntFee[i] = bigAdd(burntFee[i-1], fullFee) // TODO: withTip with KIP-162
+ burntFee[i] = bigAdd(burntFee[i-1], withTip)
}
nums := []uint64{0, 1, 99, 100, 199, 200, 299, 300, 399, 400} |
blukat29
approved these changes
May 24, 2024
JayChoi1736
approved these changes
May 24, 2024
hyeonLewis
approved these changes
May 24, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Types of changes
Please put an x in the boxes related to your change.
Checklist
Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
$ make test
)Related issues
Further comments
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...