Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
c04c236
feat: implement distribution of rewards to L1 and L2 using a Reservoir
pcarranzav May 17, 2022
bef792e
fix: document potential drip reverts if issuance rate is updated [L-01]
pcarranzav Jul 11, 2022
a34e508
fix: document drip revert when l2RewardsFraction changed [L-02]
pcarranzav Jul 11, 2022
d2e53fd
fix: rename variables related to supply to issuanceBase to make it cl…
pcarranzav Jul 11, 2022
4ad867a
fix: use issuanceBase check to prevent calling initialSnapshot twice …
pcarranzav Jul 11, 2022
a8144df
test: fix tests after not allowing initialSnapshot to be called twice
pcarranzav Jul 12, 2022
5c6802f
fix: document the need for drip after a param update [L-06]
pcarranzav Jul 13, 2022
b6e1497
fix: validate L2Reservoir address on L1Reservoir [L-07]
pcarranzav Jul 12, 2022
ad09ca0
fix: rename normalizedSupply to l2IssuanceBase in L2 message to avoid…
pcarranzav Jul 13, 2022
8cd3270
fix: remove silent failure if rewardsManager is not set [L-12]
pcarranzav Jul 13, 2022
19dd310
fix: general code improvements [N-05]
pcarranzav Jul 13, 2022
6a50012
fix: use internal function to consistently set dripInterval [N-07]
pcarranzav Jul 13, 2022
965dbb3
fix: remove named returns [N-08]
pcarranzav Jul 13, 2022
f4bc6f9
fix: update some outdated docstrings and comments [N-09]
pcarranzav Jul 13, 2022
2c89ea7
fix: document why some variables are not set during initialization [N…
pcarranzav Jul 13, 2022
c1336ef
fix: add missing getters to Managed [N-11]
pcarranzav Jul 13, 2022
86cddb8
fix: separate contracts into different files [N-13]
pcarranzav Jul 14, 2022
d327b36
fix: rename some variables for clarity [N-14]
pcarranzav Jul 14, 2022
af81533
fix: document the need to retry tickets if drip is received out-of-or…
pcarranzav Jul 14, 2022
f20124a
fix: various typos [N-16]
pcarranzav Jul 14, 2022
1d1e319
fix: replace MAX_UINT256 with type().max [N-18] [N-20]
pcarranzav Jul 14, 2022
9031651
fix: remove an unused import [N-21]
pcarranzav Jul 14, 2022
e2e08d1
test: remove repeated addToCallhookWhitelist
pcarranzav Jul 15, 2022
bbb3fad
fix: use SafeMath more consistently
pcarranzav Jul 15, 2022
e2766b3
feat: keeper reward for reservoir drip through token issuance
pcarranzav Jun 5, 2022
fc42c3f
fix: don't use tx.origin as it will not work
pcarranzav Jun 8, 2022
e69c095
fix: only allow indexers, their operators, or whitelisted addresses t…
pcarranzav Jun 21, 2022
c274636
test: fix rewards and reservoir tests after restricting drip callers
pcarranzav Jun 21, 2022
51db5f9
test: add a test for the keeper reward delivery in L2
pcarranzav Jun 23, 2022
a54a629
fix: provide part of the keeper reward to L2 redeemer
pcarranzav Jun 27, 2022
e275908
fix: clean up comments about redeemer
pcarranzav Jul 15, 2022
6d0c39d
fix: more documentation details
pcarranzav Jul 15, 2022
e727133
fix: use safe math for minDripInterval
pcarranzav Jul 15, 2022
c4d583a
fix: validate input when granting/revoking drip permission
pcarranzav Jul 15, 2022
304d055
fix: docs and inheritance for IArbTxWithRedeemer
pcarranzav Jul 28, 2022
a570c8c
fix: remove minDripInterval from the drip keeper reward calculation […
pcarranzav Aug 5, 2022
2432862
fix: use L2 alias of l1ReservoirAddress when comparing getCurrentRede…
pcarranzav Aug 8, 2022
f1c9530
fix: don't include keeper reward twice when computing what to send to…
pcarranzav Aug 17, 2022
26a4922
test: add test to ensure no DoS if l2RewardsFraction is zeroed [H-04]
pcarranzav Aug 22, 2022
8869e69
test: optimize functions to advance blocks and fix some race conditions
pcarranzav Aug 22, 2022
7207a23
fix: add some missing validation on reservoirs [M-01]
pcarranzav Aug 22, 2022
117cb4a
fix: add some missing docstrings [L-04]
pcarranzav Aug 22, 2022
f2e1f81
fix: use a single-condition requires for the drip auth check [L-05]
pcarranzav Aug 22, 2022
33f7ec2
fix: add indexed params to dripper change events [N-01]
pcarranzav Aug 22, 2022
fb3ed11
fix: use explicit imports in relevant reservoir contracts [N-02]
pcarranzav Aug 22, 2022
53e0a80
test: fix call in l2Reservoir test
pcarranzav Sep 1, 2022
559ea00
fix: adjust gre, e2e and configs to account for reservoirs
pcarranzav Sep 27, 2022
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
Prev Previous commit
Next Next commit
fix: rename normalizedSupply to l2IssuanceBase in L2 message to avoid…
… confusion [L-10]
  • Loading branch information
pcarranzav committed Sep 28, 2022
commit ad09ca007a7cc13b37c68124db5dc6a8653171e6
4 changes: 2 additions & 2 deletions contracts/reservoir/L1Reservoir.sol
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,10 @@ contract L1Reservoir is L1ReservoirV1Storage, Reservoir {
uint256 gasPriceBid,
uint256 maxSubmissionCost
) internal {
uint256 normalizedSupply = l2RewardsFraction.mul(issuanceBase).div(TOKEN_DECIMALS);
uint256 l2IssuanceBase = l2RewardsFraction.mul(issuanceBase).div(TOKEN_DECIMALS);
bytes memory extraData = abi.encodeWithSelector(
IL2Reservoir.receiveDrip.selector,
normalizedSupply,
l2IssuanceBase,
issuanceRate,
nextDripNonce
);
Expand Down