Skip to content
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.

Sign up for GitHub

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

Migrate UniswapNFTManager to use BorrowerNFT-style args #234

Merged
merged 1 commit into from
Jan 3, 2024
Merged

Migrate UniswapNFTManager to use BorrowerNFT-style args #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion periphery/script/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ contract DeployScript is Script {
new BorrowerNFTSimpleManager{salt: TAG}();
new BoostManager{salt: TAG}(FACTORY, address(borrowerNft), uniswapPositionNft);
new Permit2Manager{salt: TAG}(PERMIT2, FACTORY, address(borrowerNft));
new UniswapNFTManager{salt: TAG}(FACTORY, address(borrowerNft), uniswapPositionNft);

// Plain managers
new FrontendManager{salt: TAG}(FACTORY);
new SimpleManager{salt: TAG}();
new UniswapNFTManager{salt: TAG}(FACTORY, uniswapPositionNft);

vm.stopBroadcast();
}
Expand Down
17 changes: 14 additions & 3 deletions periphery/src/managers/UniswapNFTManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,27 @@ contract UniswapNFTManager is IManager {

Factory public immutable FACTORY;

address public immutable BORROWER_NFT;

IUniswapPositionNFT public immutable UNISWAP_NFT;

constructor(Factory factory, IUniswapPositionNFT uniswapNft) {
constructor(Factory factory, address borrowerNft, IUniswapPositionNFT uniswapNft) {
FACTORY = factory;
BORROWER_NFT = borrowerNft;
UNISWAP_NFT = uniswapNft;
}

function callback(bytes calldata data, address owner, uint208) external override returns (uint208 positions) {
// We cast `msg.sender` as a `Borrower`, but it could really be anything. DO NOT TRUST!
Borrower borrower = Borrower(payable(msg.sender));

// Need to check that `msg.sender` is really a borrower and that its owner is `BORROWER_NFT`
// in order to be sure that incoming `data` is in the expected format
require(FACTORY.isBorrower(msg.sender) && owner == BORROWER_NFT, "Aloe: bad caller");

// Now `owner` is the true owner of the borrower
owner = address(bytes20(data[:20]));

// The ID of the NFT to which liquidity will be added/removed
uint256 tokenId;
// The position's lower tick
Expand All @@ -31,12 +42,12 @@ contract UniswapNFTManager is IManager {
int24 upper;
// The change in the NFT's liquidity. Negative values move NFT-->Borrower, positives do the opposite
int128 liquidity;
(tokenId, lower, upper, liquidity, positions) = abi.decode(data, (uint256, int24, int24, int128, uint144));
(tokenId, lower, upper, liquidity, positions) = abi.decode(data[20:], (uint256, int24, int24, int128, uint144));

// move position from NonfungiblePositionManager to Borrower
if (liquidity < 0) {
// safety checks since this contract will be approved to manager users' positions
require(FACTORY.isBorrower(msg.sender) && owner == UNISWAP_NFT.ownerOf(tokenId));
require(owner == UNISWAP_NFT.ownerOf(tokenId));

_withdrawFromNFT(tokenId, uint128(-liquidity), msg.sender);
borrower.uniswapDeposit(lower, upper, uint128(-liquidity));
Expand Down