Skip to content

style: update shares variable names #801

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

Merged
merged 3 commits into from
Nov 18, 2025
Merged

style: update shares variable names #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01de9bf
style: update shares variable names
adhusson Nov 18, 2025
11e1cf4
style: rename in event def
adhusson Nov 18, 2025
67160c0
Merge branch 'feat/one-market-per-adapter' into feat/minted-varname
adhusson Nov 18, 2025
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
16 changes: 8 additions & 8 deletions src/adapters/MorphoMarketV1Adapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,19 @@ contract MorphoMarketV1Adapter is IMorphoMarketV1Adapter {
require(data.length == 0, InvalidData());
require(msg.sender == parentVault, NotAuthorized());

uint256 shares;
uint256 mintedShares;
if (assets > 0) {
(, shares) = IMorpho(morpho).supply(marketParams(), assets, 0, address(this), hex"");
(, mintedShares) = IMorpho(morpho).supply(marketParams(), assets, 0, address(this), hex"");
// Safe cast because Market V1 bounds the total shares to uint128.max.
supplyShares += uint128(shares);
supplyShares += uint128(mintedShares);
}

uint256 _newAllocation = newAllocation();
// Safe casts because Market V1 bounds totalSupplyAssets to uint128.max.
int256 change = int256(_newAllocation) - int256(uint256(allocation));
allocation = uint128(_newAllocation);

emit Allocate(shares);
emit Allocate(mintedShares);

return (ids(), change);
}
Expand All @@ -110,19 +110,19 @@ contract MorphoMarketV1Adapter is IMorphoMarketV1Adapter {
require(data.length == 0, InvalidData());
require(msg.sender == parentVault, NotAuthorized());

uint256 shares;
uint256 burnedShares;
if (assets > 0) {
(, shares) = IMorpho(morpho).withdraw(marketParams(), assets, 0, address(this), address(this));
(, burnedShares) = IMorpho(morpho).withdraw(marketParams(), assets, 0, address(this), address(this));
// Safe cast because Market V1 bounds the total shares to uint128.max.
supplyShares -= uint128(shares);
supplyShares -= uint128(burnedShares);
}

uint256 _newAllocation = newAllocation();
// Safe casts because Market V1 bounds totalSupplyAssets to uint128.max.
int256 change = int256(_newAllocation) - int256(uint256(allocation));
allocation = uint128(_newAllocation);

emit Deallocate(shares);
emit Deallocate(burnedShares);

return (ids(), change);
}
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/interfaces/IMorphoMarketV1Adapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {Id, MarketParams} from "../../../lib/morpho-blue/src/interfaces/IMorpho.
interface IMorphoMarketV1Adapter is IAdapter {
/* EVENTS */

event Allocate(uint256 shares);
event Deallocate(uint256 shares);
event Allocate(uint256 mintedShares);
event Deallocate(uint256 burnedShares);
event SetSkimRecipient(address indexed newSkimRecipient);
event Skim(address indexed token, uint256 assets);

Expand Down
Loading