Add initial LockstakeEngine/Urn/Clipper logic + tests #1

sunbreak1211 · 2023-09-22T14:15:29Z

No description provided.

* Create urn and allow to operate without defined delegate * fix more error messages * Option to remove delegate * Move delegate function * Improve test coverage

oldchili · 2023-11-29T13:46:29Z

src/LockstakeEngine.sol

+    bytes32             immutable public ilk;
+    GemLike             immutable public gov;
+    GemLike             immutable public stkGov;
+    uint256             immutable public fee;


Consider making fee configurable.

This is done here: #5

Are you sure? still seems immutable there.

Sorry, this message was wrongly set, it was for another issue. I still have my reservations about this change. Let's leave it as it until we have some discussion.

src/LockstakeEngine.sol

src/LockstakeUrn.sol

src/LockstakeEngine.sol

Co-authored-by: oldchili <[email protected]>

src/LockstakeEngine.sol

* Allow urn management to another address * Add tests * Add isUrnAuth getter * Remove README * Extend testHopeNope * Remove line Co-authored-by: oldchili <[email protected]> --------- Co-authored-by: oldchili <[email protected]>

src/LockstakeEngine.sol

test/LockstakeEngine.t.sol

test/LockstakeClipper.t.sol

Co-authored-by: oldchili <[email protected]>

* Support multicall for LockstakeEngine * Sketch use of converter inside LockstakeEngine * Send out ngt from converter, separate events * Add index parameter to open() * Approve tokens to mkrNgt in the constructor * gov => mkr, stkGov => stkMkr * public => external Co-authored-by: sunbreak1211 <[email protected]> * Change revert message * new line at end of file Co-authored-by: sunbreak1211 <[email protected]> * Put ngt functions after regular ones * Change order of events as well Co-authored-by: sunbreak1211 <[email protected]> * ngt tests and testing open with wrong index --------- Co-authored-by: sunbreak <[email protected]> Co-authored-by: sunbreak1211 <[email protected]>

* Stake with lock, withdraw with free * clean farm onTakeLeftovers * Add missing farm reset in onTakeLeftovers * Reset farm and delegate on each onKick and onTakeLeftovers * Fixes on _selectFarm * Minor move of call * Fix issue in onKick + reorder some functions * First round of adapting tests for new structure * Fix for onTakeLeftovers * Revert on selecting the same farm as existing one * Use ink also for farm operations * Use local var for ink before kick * Modify comment - correctly undelegate and unstake --------- Co-authored-by: oldchili <[email protected]>

kmbarry1 · 2024-06-11T01:05:21Z

src/LockstakeUrn.sol

+    function init() external isEngine {
+        vat.hope(msg.sender);
+        lsmkr.approve(msg.sender, type(uint256).max);


A small optimization here, since you seem to care about open gas, would be to use engine instead of msg.sender (since engine is immutable) and remove the isEngine modifier. But it will not make a large difference.

* Add a few Readme comments * Update README.md Co-authored-by: telome <[email protected]> --------- Co-authored-by: telome <[email protected]>

* Use owner/index as key for user functions * Fix in README * Renaming * Change to isUrnAuth * Minor tests change * Use grab instead of frob in onRemove * Use jug.drip to update rate in selectVoteDelegate

DaiFoundation-DevOps · 2024-08-22T10:48:57Z

All committers have signed the CLA.

* Certora setup (#37) * builtin sanity, pre_condition rule * folders * more rules with advanced CVL properties * document examples * more options for ClipperCallee concrete implementations * fix also fr Clipper * where am I taken from * fix * remove kick summarization * remove kick * update links * added rule sanity to configs * added basic multicall spec * adds a test solidity contract for multicall * final setup touches and multicall * added certora files and vim to gitignore --------- Co-authored-by: EyalHochCertora <[email protected]> Co-authored-by: EyalHCertora <[email protected]> * LockstakeUrn * Fix file header * Use real Vat code and some changes to urn conf * Use double quotes * Add LockstakeMkr spec * Fix * Revert removal of end line * LockstakeEngine (WIP) + Minor change for LockstakeUrn * Remove space * Remove factory from voteDelegate file * Add missing check for selectVoteDelegate + add selectFarm and selectFarm_revert specs * Add lock spec + minor changes to others * lock_revert spec * Improve comments * lockNgt and lockNgt_revert specs * Add free and feeeNgt specs * Add free_revert and freeNgt_revert specs * Add some new invariant rules + tidy up * Add freeNoFee and freeNoFee_revert specs * Simplify messages for non revert rules * Add draw and draw_revert specs * Add wipe, wipeAll and getReward specs * Add wipe_revert and onKick specs * Add wipeAll_revert spec * Add getReward_revert spec * farm renaming + minor changes * Add onKick_revert spec + minor comments fix * Fixes for inkMatchesLsmkrFarm * Add onTake and onTake_revert specs * Add onRemove and onRemove_revert specs * Separate Multicall rules to different file + fix wipe_revert * Minor changes * Comment change * First batch of LocstakeClipper specs * Add redo and redo_specs + fix in storageAffected * Clean up * Fix specs timeouts for LockstakeEngine * Add take spec + changes to storageAffected * stopped revert conditions better matching with code * Add take_revert spec * Clipper: some variables renaming * Add upchost upchost_revert specs * Fix for take spec + add yank and yank_revert specs * Engine: Rename several variables * Update specs to newer version * Remove unused function * Fix CI * Fix missing solc versions CI * Fix timeouts * Fix * Change * Some cleaning in multicall specs * Add more invariants to LockstakeEngine * Improve invariants for staking * Fix * Changes in invariants * Include view functions invariants as well * Fix --------- Co-authored-by: Shoham Shamir <[email protected]> Co-authored-by: EyalHochCertora <[email protected]> Co-authored-by: EyalHCertora <[email protected]>

sunbreak1211 · 2024-10-21T15:06:46Z

@telome @oldchili please give final approval and I'll get this merged. It will be used regular merging type to preserve audited commits.

Add initial LockstakeEngine/Urn/Clipper logic + tests

38a06e2

sunbreak1211 requested review from telome and oldchili September 22, 2023 14:15

sunbreak1211 added 2 commits November 22, 2023 13:42

Rename ngt to more general gov wording

c2d9b4f

Fix error message

b305879

sunbreak1211 mentioned this pull request Nov 23, 2023

Create urn and allow to operate without defined delegate #3

Merged

sunbreak1211 and others added 3 commits November 24, 2023 09:36

Fix typo

a0f93ed

Create urn and allow to operate without defined delegate (#3)

642445b

* Create urn and allow to operate without defined delegate * fix more error messages * Option to remove delegate * Move delegate function * Improve test coverage

Add some variable renaming + test some error messages

b69c955

oldchili reviewed Nov 29, 2023

View reviewed changes

sunbreak1211 added 7 commits December 8, 2023 12:15

Minors

5cda4c3

Use solidity to crete urn

d3e4a6b

Add receiver parameter to free

fae2bea

Modify event for extra parameter of free

35ccc9d

Add receiver parameter to getReward

7bfb412

Don't allow to keep staking when farm is removed by admin

2527ae7

Change order in free to match reversed one from lock

4464593

oldchili reviewed Dec 10, 2023

View reviewed changes

src/LockstakeEngine.sol Outdated Show resolved Hide resolved

Change comment

6ab1d9e

Co-authored-by: oldchili <[email protected]>

oldchili reviewed Dec 12, 2023

View reviewed changes

src/LockstakeEngine.sol Outdated Show resolved Hide resolved

sunbreak1211 and others added 3 commits December 12, 2023 16:42

selectedFarm => urnFarms

c2bff63

Remove unnecessary require

c7fa375

Allow other address to do urn management (#5)

fae51fb

* Allow urn management to another address * Add tests * Add isUrnAuth getter * Remove README * Extend testHopeNope * Remove line Co-authored-by: oldchili <[email protected]> --------- Co-authored-by: oldchili <[email protected]>

telome reviewed Dec 18, 2023

View reviewed changes

src/LockstakeEngine.sol Outdated Show resolved Hide resolved

oldchili reviewed Dec 20, 2023

View reviewed changes

test/LockstakeEngine.t.sol Outdated Show resolved Hide resolved

oldchili reviewed Dec 20, 2023

View reviewed changes

test/LockstakeClipper.t.sol Outdated Show resolved Hide resolved

sunbreak1211 and others added 4 commits December 20, 2023 07:45

Test name fixes

87b9a68

Co-authored-by: oldchili <[email protected]>

Missign stkGov => stkMkr renaming

917420f

sunbreak1211 added 6 commits June 5, 2024 12:33

Add comment in getUrn

f240c59

Add check to deploy scripts

98fd542

Extend Multicall revert handling

d3878d4

Minor change to a mock

739c497

Minor changes

f83e7fb

Check in init script for tip

de66d6f

kmbarry1 reviewed Jun 11, 2024

View reviewed changes

oldchili and others added 4 commits June 27, 2024 10:41

Add Cantina report (#52)

f11051e

Add a few Readme comments (#53)

84d5b98

* Add a few Readme comments * Update README.md Co-authored-by: telome <[email protected]> --------- Co-authored-by: telome <[email protected]>

Remove up to date implementation links (#54)

39dbea9

Update CS Report (#56)

cbb2671

sunbreak1211 mentioned this pull request Aug 19, 2024

nirohgo - LockStakeEngine::OnRemove wrong fee amount calculation sherlock-audit/2024-06-makerdao-endgame-judging#106

Closed

oldchili and others added 2 commits August 20, 2024 16:27

Configurable exit fee (#55)

5d3eea5

Post contest updates (#57)

8b16eac

* Use owner/index as key for user functions * Fix in README * Renaming * Change to isUrnAuth * Minor tests change * Use grab instead of frob in onRemove * Use jug.drip to update rate in selectVoteDelegate

sunbreak1211 and others added 6 commits August 27, 2024 15:52

Renaming (#59)

7c71318

Update CS audit report (#60)

7a93cb4

Add new Cantina audit report (#61)

304c885

Add Sherlock Report (#62)

445cd30

Fix tests after spell cast + minor update on README

445b08a

telome previously approved these changes Oct 22, 2024

View reviewed changes

Certora: minor changes

444e723

sunbreak1211 dismissed telome’s stale review via 444e723 October 22, 2024 16:30

oldchili previously approved these changes Oct 23, 2024

View reviewed changes

Certora: Improve PATH compatibility

2e6e3e8

sunbreak1211 dismissed oldchili’s stale review via 2e6e3e8 October 25, 2024 20:16

Adjust Certora flags

745ffd7

sunbreak1211 merged commit 602edbb into master Nov 12, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add initial LockstakeEngine/Urn/Clipper logic + tests #1

Add initial LockstakeEngine/Urn/Clipper logic + tests #1

sunbreak1211 commented Sep 22, 2023

oldchili Nov 29, 2023

sunbreak1211 Dec 8, 2023

oldchili Dec 11, 2023

sunbreak1211 Dec 11, 2023

kmbarry1 Jun 11, 2024

DaiFoundation-DevOps commented Aug 22, 2024 •

edited

Loading

sunbreak1211 commented Oct 21, 2024

Add initial LockstakeEngine/Urn/Clipper logic + tests #1

Add initial LockstakeEngine/Urn/Clipper logic + tests #1

Conversation

sunbreak1211 commented Sep 22, 2023

oldchili Nov 29, 2023

Choose a reason for hiding this comment

sunbreak1211 Dec 8, 2023

Choose a reason for hiding this comment

oldchili Dec 11, 2023

Choose a reason for hiding this comment

sunbreak1211 Dec 11, 2023

Choose a reason for hiding this comment

kmbarry1 Jun 11, 2024

Choose a reason for hiding this comment

DaiFoundation-DevOps commented Aug 22, 2024 • edited Loading

sunbreak1211 commented Oct 21, 2024

DaiFoundation-DevOps commented Aug 22, 2024 •

edited

Loading