-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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.
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
feat(protocol): Calculate fee/reward based on proof time w/ 1559 math #13489
Merged
adaki2004
merged 101 commits into
major_protocol_upgrade_rebase
from
prove_time_based_rewards_exp
Apr 22, 2023
+1,815
−1,776
Merged
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit
Hold shift + click to select a range
167d957
change timebased fee calculation
dantaik c693da5
change timebased fee calculation
dantaik 749c63f
change timebased fee calculation
dantaik d0c5c5a
Merge branch 'major_protocol_upgrade_rebase' into fee_reward_fix
dantaik d2cd0d5
Merge branch 'major_protocol_upgrade_rebase' into fee_reward_fix
dantaik ae82406
Merge branch 'major_protocol_upgrade_rebase' into fee_reward_fix
dantaik 699a045
rename
dantaik fc5863f
Merge branch 'major_protocol_upgrade_rebase' into fee_reward_fix
dantaik 975b057
rename
dantaik 0e6242c
rename
dantaik b256bc1
implement 1559 for L2
dantaik 0725c7a
implement 1559 for L2
dantaik ccec538
implement 1559 for L2
dantaik 4f0162e
implement 1559 for L2
dantaik 64548f0
implement 1559 for L2
dantaik c85f74e
implement 1559 for L2
dantaik c10f480
more
dantaik bafe0eb
fix tests
dantaik 8ff0da3
fix tests
dantaik 8a22c88
fix tests
dantaik b161046
fix tests
dantaik ca8dec2
fix tests
dantaik cd4605d
fix tests
dantaik 467d1ad
fix tests
dantaik dcd55ec
fix tests
dantaik ec38ef3
fix tests
dantaik a48a6b7
fix tests
dantaik 51df62e
fix tests
dantaik 9010aea
fix tests
dantaik 269896b
Merge branch 'fee_reward_fix' into L2_1559
dantaik 95fc8cd
fix tests
dantaik 80388a2
fix tests
dantaik 718f25f
fix tests
dantaik 45da2f6
Merge branch 'major_protocol_upgrade_rebase' into L2_1559
dantaik da2b35f
fix tests
dantaik 8c6e3fa
fix tests
dantaik dd658eb
fix tests
dantaik f9bb2a9
Add FeeAndRewardConfig structure to calculate fee-rewards based on pr…
adaki2004 626957a
Following changes:
adaki2004 120d408
Changes
adaki2004 dc442e5
Delete logging and unnecessary vars and enable one additional test
adaki2004 a3be428
feat(protocol): calculate L2 EIP-1558 basefee on L1 (#13468)
dantaik 81509c6
update foundry.toml
dantaik a4eae93
minor fix TaikoL2
dantaik 9c1592c
fix
dantaik d287942
fix
dantaik e4ddb8d
+deploy_on_l1.sh
dantaik ee225b8
+deploy_on_l1.sh
dantaik c56dcbf
+deploy_on_l1.sh
dantaik 5066081
Changes
adaki2004 51da738
Remove old archived files
adaki2004 9786d10
Remove archived test file
adaki2004 266b021
add doc
dantaik 5b294a9
add doc
dantaik fcc1fac
+deploy_on_l1.sh
dantaik d9d4940
+deploy_on_l1.sh
dantaik 45a94fa
+deploy_on_l1.sh
dantaik ccebb17
Changes:
adaki2004 867f384
Remove python algo
adaki2004 37c0928
PR review 1
adaki2004 22bb8f5
rebase with upstream
dantaik 0a93f38
Changes:
adaki2004 eae7519
Added mechanism to pool and distribute rewards based on deposits
adaki2004 d5cc8e8
step1
dantaik b162d88
step1
dantaik 13354c0
fix
dantaik 475399e
fix
dantaik f5ed9c2
fix
dantaik be2d91a
fix
dantaik 709c895
fix
dantaik 1f73d97
fix
dantaik e3648b8
fix
dantaik c02042d
fix
dantaik e1b099d
fix
dantaik 0a8f01d
fix
dantaik 00ff4dc
fix
dantaik 48f950c
fix
dantaik 58936eb
fix
dantaik 0945a2d
fix
dantaik 1994877
fix
dantaik 14e4fb7
fix
dantaik 97330af
fix
dantaik 24f1df9
PR review findings II.
adaki2004 93fee3a
Merge with base and resolve conflicts
adaki2004 f72110b
test(protocol): test 1559 calculation (#13534)
dantaik dd627c4
Remove unused libs
adaki2004 a7ec002
Drop typescript deployment task
adaki2004 e293932
Disable one (inentionally) failing tesst and remove unused gasAccumul…
adaki2004 6897c68
Merge branch 'L2_1559_rebase_in_anchor' into prove_time_based_rewards…
dantaik a05fb76
Deduct 1 from lastVerifiedBlock
adaki2004 cffbf21
refactor(protocol): recommend changes to Dani's PR (part1) (#13540)
dantaik 10aa351
Function modifier and shadow declaration in test fix
adaki2004 5a4b51b
Resolve merge conflicts with base
adaki2004 c40f5a7
Merge branch 'major_protocol_upgrade_rebase' into prove_time_based_re…
adaki2004 be00cdc
Resolve build issues after massive merge conflicts fix
adaki2004 5fd3d91
Rename getProverFee to getBlockFee
adaki2004 6348487
Changes:
adaki2004 aa27af7
Merge branch 'major_protocol_upgrade_rebase' into prove_time_based_re…
dantaik d75f3b3
Changes:
adaki2004 519dca7
Change simulated L1 blocktime to 12
adaki2004 7537cd1
refactor(protocol): improve on top of Dani's PR (#13635)
dantaik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
rename
commit 975b057114ddd0675b8512a63169826a37881be0
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can also remove
enableTokenomics
and usestate.baseFeeProof