Skip to content

Change access folder structure #4359

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
frangio merged 8 commits into from
Jul 13, 2023
Merged

Change access folder structure #4359

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9abce1
Change access folder structure
RenanSouza2 Jun 16, 2023
5320728
Add changeset
RenanSouza2 Jun 16, 2023
a7a7dea
Fix changeset
RenanSouza2 Jun 16, 2023
b8e0142
Merge branch 'master' into access-extension
RenanSouza2 Jun 17, 2023
74e558f
Fix acess readme
RenanSouza2 Jun 17, 2023
4325a99
Reorder tags in readme
RenanSouza2 Jun 17, 2023
e2d0da9
Merge branch 'master' into access-extension
Amxx Jul 13, 2023
35402b9
Update .changeset/spicy-sheep-eat.md
frangio Jul 13, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'master' into access-extension
  • Loading branch information
@Amxx
Amxx committed Jul 13, 2023
commit e2d0da90c35747adede0f6ec89e9590058e5f42b
9 changes: 5 additions & 4 deletions contracts/access/extensions/AccessControlDefaultAdminRules.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 "./IAccessControlDefaultAdminRules.sol";
import "../AccessControl.sol";
import "../../utils/math/SafeCast.sol";
import "../../interfaces/IERC5313.sol";
import {IAccessControlDefaultAdminRules} from "./IAccessControlDefaultAdminRules.sol";
import {AccessControl, IAccessControl} from "../AccessControl.sol";
import {SafeCast} from "../../utils/math/SafeCast.sol";
import {Math} from "../../utils/math/Math.sol";
import {IERC5313} from "../../interfaces/IERC5313.sol";

/**
* @dev Extension of {AccessControl} that allows specifying special rules to manage
Expand Down
6 changes: 3 additions & 3 deletions contracts/access/extensions/AccessControlEnumerable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

pragma solidity ^0.8.19;

import "./IAccessControlEnumerable.sol";
import "../AccessControl.sol";
import "../../utils/structs/EnumerableSet.sol";
import {IAccessControlEnumerable} from "./IAccessControlEnumerable.sol";
import {AccessControl} from "../AccessControl.sol";
import {EnumerableSet} from "../../utils/structs/EnumerableSet.sol";

/**
* @dev Extension of {AccessControl} that allows enumerating the members of each role.
Expand Down
2 changes: 1 addition & 1 deletion contracts/access/extensions/IAccessControlDefaultAdminRules.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

pragma solidity ^0.8.19;

import "../IAccessControl.sol";
import {IAccessControl} from "../IAccessControl.sol";

/**
* @dev External interface of AccessControlDefaultAdminRules declared to support ERC165 detection.
Expand Down
2 changes: 1 addition & 1 deletion contracts/access/extensions/IAccessControlEnumerable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

pragma solidity ^0.8.19;

import "../IAccessControl.sol";
import {IAccessControl} from "../IAccessControl.sol";

/**
* @dev External interface of AccessControlEnumerable declared to support ERC165 detection.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.