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

feat: access module #77

Merged
merged 11 commits into from
Nov 10, 2024
Merged

feat: access module #77

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4de223e
refactor: create ModuleAccessControl, use AccessModule
xorsal Nov 6, 2024
0e6fb1b
refactor: remove AccessControllerModule
xorsal Nov 6, 2024
c6912b0
feat: skip access control validation when address module is not set
xorsal Nov 6, 2024
1955be4
test: add necessary mocked call in access control unit testing
xorsal Nov 6, 2024
2d63d58
chore: update prophet-core version
xorsal Nov 6, 2024
bde5b21
fix: package version
ashitakah Nov 7, 2024
13b03b8
refactor: rename modules/accessControl to modules/access
xorsal Nov 7, 2024
0610e87
feat: add IModuleAccessController interface
xorsal Nov 8, 2024
fc27d21
feat: update hasAccess modifier
xorsal Nov 8, 2024
2b5a988
test: add unit test for when user did not approve the access module
xorsal Nov 8, 2024
8607835
feat: use library instead of free variables
xorsal Nov 8, 2024
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
14 changes: 7 additions & 7 deletions solidity/contracts/modules/access/ModuleAccessController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ pragma solidity ^0.8.19;

import {CommonAccessController} from '@defi-wonderland/prophet-core/solidity/contracts/CommonAccessController.sol';

import {IModuleAccessController} from '../../../interfaces/modules/access/IModuleAccessController.sol';
import {Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';

abstract contract ModuleAccessController is CommonAccessController, Module {
abstract contract ModuleAccessController is IModuleAccessController, CommonAccessController, Module {
constructor(IOracle _oracle) Module(_oracle) {}

/**
Expand Down Expand Up @@ -35,13 +36,12 @@ abstract contract ModuleAccessController is CommonAccessController, Module {
bytes memory _params,
AccessControl memory _accessControl
) {
if (_accessModule != address(0)) {
bool _isApproved = ORACLE.isAccessModuleApproved(_accessControl.user, _accessModule);

if (!_isApproved) revert AccessController_NoAccess();

_hasAccess(_accessModule, _typehash, _params, _accessControl);
// Revert if sender is acting for a user without module approval
if (msg.sender != _accessControl.user && !ORACLE.isAccessModuleApproved(_accessControl.user, _accessModule)) {
revert ModuleAccessController_AccessModuleNotApproved();
0xJabberwock marked this conversation as resolved.
Show resolved Hide resolved
}
// todo: probably a change name is required here, something like `_ensureAccess`?
_hasAccess(_accessModule, _typehash, _params, _accessControl);
_;
}
}