Skip to content

Update uniswap v2 lockstake clipper callee#45

Merged
SidestreamColdMelon merged 14 commits intomasterfrom
update-uniswap-v2-lockstake-clipper-callee
Dec 1, 2025
Merged

Update uniswap v2 lockstake clipper callee#45
SidestreamColdMelon merged 14 commits intomasterfrom
update-uniswap-v2-lockstake-clipper-callee

Conversation

@SidestreamBurningBanana
Copy link
Contributor

This PR adjusts the UniswapV2LockstakeCallee contract to support the updated LockstakeEngine. MKR support was removed from the callee in favour of supporting SKY only.

Notes:

  • CI is expected to fail due to the tests for other callees being fragile / depending on the market

    • In order to test this specific callee, one can locally run:
      forge test --skip UniswapV3 Oasis PSM Curve UniswapV2Lp UniswapV2Callee OneInch Simulation --match-contract=UniswapV2LockstakeCallee
  • Current version of the callee supports any UniV2 paths that start from SKY and end with DAI or USDS (in other words, SKY/USDS pool is supported, and potentially others).

@DaiFoundation-DevOps
Copy link

DaiFoundation-DevOps commented Apr 9, 2025

CLA assistant check
All committers have signed the CLA.

@SidestreamColdMelon
Copy link

SidestreamColdMelon commented Apr 22, 2025

TLDR: Good to deploy!

  • lockstake submodule is updated to match the latest commit (5c065ee) in the relevant PR
  • ✅ Constructor parameters are updated to no longer require MKR or the MkrSky converter (since it's now one-way)
  • ✅ Input gem is expected to always be SKY
  • ✅ Tests are updated to match original tests from the makerdao/lockstake PR
  • ✅ All callee tests pass at the latest commit 28ebb22 (when executed using provided command)
$ forge test --skip UniswapV3 Oasis PSM Curve UniswapV2Lp UniswapV2Callee OneInch Simulation --match-contract=UniswapV2LockstakeCallee
[⠊] Compiling...
No files changed, compilation skipped

Ran 8 tests for src/test/UniswapV2LockstakeCallee.t.sol:UniswapV2LockstakeCalleeTest
[PASS] testCalleeTake_NoDelegate_NoStaking_SkyDai() (gas: 3447469)
[PASS] testCalleeTake_NoDelegate_NoStaking_SkyUsds() (gas: 3435353)
[PASS] testCalleeTake_NoDelegate_WithStaking_SkyDai() (gas: 3487142)
[PASS] testCalleeTake_NoDelegate_WithStaking_SkyUsds() (gas: 3475002)
[PASS] testCalleeTake_WithDelegate_NoStaking_SkyDai() (gas: 3483474)
[PASS] testCalleeTake_WithDelegate_NoStaking_SkyUsds() (gas: 3471379)
[PASS] testCalleeTake_WithDelegate_WithStaking_SkyDai() (gas: 3523062)
[PASS] testCalleeTake_WithDelegate_WithStaking_SkyUsds() (gas: 3510987)
Suite result: ok. 8 passed; 0 failed; 0 skipped; finished in 38.18s (22.44s CPU time)

Ran 1 test suite in 38.20s (38.18s CPU time): 8 tests passed, 0 failed, 0 skipped (8 total tests)

@SidestreamIcedMango
Copy link

Good to deploy!

Uniswap V2 Lockstake Clipper Callee Review

  • Checked callee contract
    • Callee now expects SKY as a token to be exchanged, MKR token support is completely removed
    • No other changes were made
  • Checked tests
forge test --skip UniswapV3 Oasis PSM Curve UniswapV2Lp UniswapV2Callee OneInch Simulation --match-contract=UniswapV2LockstakeCallee
[⠊] Compiling...
No files changed, compilation skipped

Ran 8 tests for src/test/UniswapV2LockstakeCallee.t.sol:UniswapV2LockstakeCalleeTest
[PASS] testCalleeTake_NoDelegate_NoStaking_SkyDai() (gas: 3447469)
[PASS] testCalleeTake_NoDelegate_NoStaking_SkyUsds() (gas: 3435353)
[PASS] testCalleeTake_NoDelegate_WithStaking_SkyDai() (gas: 3487142)
[PASS] testCalleeTake_NoDelegate_WithStaking_SkyUsds() (gas: 3475002)
[PASS] testCalleeTake_WithDelegate_NoStaking_SkyDai() (gas: 3483474)
[PASS] testCalleeTake_WithDelegate_NoStaking_SkyUsds() (gas: 3471379)
[PASS] testCalleeTake_WithDelegate_WithStaking_SkyDai() (gas: 3523062)
[PASS] testCalleeTake_WithDelegate_WithStaking_SkyUsds() (gas: 3510987)
Suite result: ok. 8 passed; 0 failed; 0 skipped; finished in 11.01s (19.93s CPU time)

Ran 1 test suite in 11.01s (11.01s CPU time): 8 tests passed, 0 failed, 0 skipped (8 total tests)

Copy link
Contributor

@DaeunYoon DaeunYoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deployed contract lgtm

Verify callee deployment

Copy link

@SidestreamColdMelon SidestreamColdMelon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SidestreamColdMelon SidestreamColdMelon merged commit 6afadd5 into master Dec 1, 2025
1 of 3 checks passed
@SidestreamColdMelon SidestreamColdMelon deleted the update-uniswap-v2-lockstake-clipper-callee branch December 1, 2025 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants