Skip to content

feat: add abdication #840

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
MathisGD merged 7 commits into from
Dec 2, 2025
Merged

feat: add abdication #840

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0241ca5
feat: add abdication
MathisGD Dec 1, 2025
9a7e251
Merge remote-tracking branch 'origin/refactor/timelocks' into refacto…
MathisGD Dec 1, 2025
5f1163d
Update src/adapters/MorphoMarketV1Adapter.sol
MathisGD Dec 1, 2025
1a8e156
Merge branch 'refactor/timelocks' into refactor/abdicate
MathisGD Dec 1, 2025
6ab7ab4
test: abdicate
MathisGD Dec 2, 2025
b047efb
Merge branch 'refactor/timelocks' into refactor/abdicate
MathisGD Dec 2, 2025
297dfc5
chore:fmt
MathisGD Dec 2, 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
1 change: 1 addition & 0 deletions src/adapters/MorphoMarketV1Adapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ contract MorphoMarketV1Adapter is IMorphoMarketV1Adapter {
function timelocked() internal {
require(executableAt[msg.data] != 0, NotPending());
require(block.timestamp >= executableAt[msg.data], TimelockNotExpired());
require(!IVaultV2(parentVault).abdicated(bytes4(msg.data)), Abdicated());
executableAt[msg.data] = 0;
emit Accept(bytes4(msg.data), msg.data);
Comment thread
MathisGD marked this conversation as resolved.
Outdated
}
Expand Down
1 change: 1 addition & 0 deletions src/adapters/interfaces/IMorphoMarketV1Adapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface IMorphoMarketV1Adapter is IAdapter {

/* ERRORS */

error Abdicated();
error AlreadyPending();
error IrmMismatch();
error LoanAssetMismatch();
Expand Down
5 changes: 5 additions & 0 deletions test/mocks/VaultV2Mock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ contract VaultV2Mock {
mapping(bytes32 => uint256) public allocation;
uint256 public _timelock;
uint256 public firstTotalAssets;
mapping(bytes4 => bool) public abdicated;

constructor(address _asset, address _owner, address _curator, address _allocator, address _sentinel) {
asset = _asset;
Expand Down Expand Up @@ -59,4 +60,8 @@ contract VaultV2Mock {
function setFirstTotalAssets(uint256 newFirstTotalAssets) external {
firstTotalAssets = newFirstTotalAssets;
}

function setAbdicated(bytes4 selector, bool newAbdicated) external {
abdicated[selector] = newAbdicated;
}
}