Skip to content

Add new admin role #479

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

Open
Spablob wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add new admin role #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e47e8d
add migration to safe scripts
Spablob Oct 14, 2025
ced31ea
fix lint
Spablob Oct 14, 2025
a33c228
adjust foundry ci
Spablob Oct 14, 2025
33449e1
add unit test
Spablob Nov 7, 2025
74a41ce
fix lint
Spablob Nov 7, 2025
d67cca9
add json files
Spablob Feb 18, 2026
e6a3395
fix to: field
Spablob Feb 18, 2026
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 .github/workflows/foundry_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Run Forge tests
run: |
forge test -vvv --no-match-test "invariant*"
forge test -vvv --no-match-test "invariant*" --no-match-contract "GrantRolesToSafeTest"
id: forge-test

- name: Run solhint
Expand Down
4 changes: 4 additions & 0 deletions contracts/lib/ProtocolAdmin.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,8 @@ library ProtocolAdmin {
/// @notice Guardian role. Grants ability to configure roles.
uint64 public constant GUARDIAN_ROLE = 3;
string public constant GUARDIAN_ROLE_LABEL = "GUARDIAN_ROLE";
/// @notice Cancellable admin role. Unlike admin role ide 0 - this role can
/// execute certain admin actions but those can be cancelled by guardian role.
uint64 public constant CANCELLABLE_ADMIN_ROLE = 4;
string public constant CANCELLABLE_ADMIN_ROLE_LABEL = "CANCELLABLE_ADMIN_ROLE";
}
2 changes: 2 additions & 0 deletions foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ solc = '0.8.26'
fs_permissions = [
{ access = 'read-write', path = './deploy-out' },
{ access = 'read', path = './out' },
{ access = 'read-write', path = './script/foundry/admin-actions/output' },
{ access = 'read-write', path = './script/foundry/admin-actions/output-test' },
]
##### Uncomment if running storage layout verification
# ffi = true
Expand Down
1 change: 1 addition & 0 deletions script/foundry/admin-actions/output/1315/grant-new-admin-role-cancel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a408d6122d0000000000000000000000004709798fea84c84ae2475ff0c25344115ee1529f0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000012de906760000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a408d6122d000000000000000000000000fe3838bfb30b34170f00030b52ea4893d8aac6bc0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000012de906760000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c408d6122d0000000000000000000000001640a22a8a086747cd377b73954545e2dfcc9cad0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000024156658500000000000000000000000000000000000000000000000000000000bd6378f80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d530000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000012408d6122d0000000000000000000000009b7a9c70aff961c799110954fc06f3093aeb94c5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000005bd238ab400000000000000000000000000000000000000000000000000000000b33b745700000000000000000000000000000000000000000000000000000000ee2a5307000000000000000000000000000000000000000000000000000000003cd0518b00000000000000000000000000000000000000000000000000000000c14cb98d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e408d6122d000000000000000000000000ffd98c3877b8789124f02c7e8239a4b0ef11e9360000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000032939544e00000000000000000000000000000000000000000000000000000000c23c094b000000000000000000000000000000000000000000000000000000001f7f90040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a408d6122d00000000000000000000000069d3a7aa9edb72bc226e745a7ccdd50d947b69ac00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000120ef83720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d530000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000012408d6122d000000000000000000000000d2f60c40febccf6311f8b47c4f2ec6b040400086000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000005f0f4426000000000000000000000000000000000000000000000000000000000154cf6d1000000000000000000000000000000000000000000000000000000002bd386530000000000000000000000000000000000000000000000000000000049fb461500000000000000000000000000000000000000000000000000000000520cbac60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a408d6122d000000000000000000000000d2f60c40febccf6311f8b47c4f2ec6b040400086000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001becfc9170000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c408d6122d000000000000000000000000dd661f55128a80437a0c0bda6e13f214a3b2eb24000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002a6bb383300000000000000000000000000000000000000000000000000000000d756a3a90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a408d6122d00000000000000000000000077319b4031e6ef1250907aa00018b8b1c67a244b000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001a72a6fa90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d53000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c408d6122d000000000000000000000000529a750e02d8e2f15649c13d69a465286a780e240000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000026e69a3e70000000000000000000000000000000000000000000000000000000018b00f830000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d530000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000012408d6122d000000000000000000000000022dbaaea5d8fb31a0ad793335e39ced5d631fa5000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000005bd345302000000000000000000000000000000000000000000000000000000009ab3efe600000000000000000000000000000000000000000000000000000000639cc67d00000000000000000000000000000000000000000000000000000000b18562540000000000000000000000000000000000000000000000000000000053e881cc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d5300000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000084853551b800000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001643414e43454c4c41424c455f41444d494e5f524f4c450000000000000000000000000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d5300000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044529629520000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"},{"from":"0x4B089bF9340DdB02a011471Eaa7d8D81C60CB524","to":"0xFdece7b8a2f55ceC33b53fd28936B4B1e3153d53","value":0,"data":"0xd6bb62c60000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000fdece7b8a2f55cec33b53fd28936b4b1e3153d530000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000006425c471a000000000000000000000000000000000000000000000000000000000000000040000000000000000000000004b089bf9340ddb02a011471eaa7d8d81c60cb524000000000000000000000000000000000000000000000000000000000000025800000000000000000000000000000000000000000000000000000000","operation":0,"comment":"grant-new-admin-role-cancel"}]
Loading