@etherisc/gif-next 0.0.2-bdb55c6-577 → 0.0.2-bdbfee9-660

package/artifacts/contracts/{shared/IAccessManagerExtended.sol/IAccessManagerExtended.json → authorization/IAccessAdmin.sol/IAccessAdmin.json}

@@ -1,163 +1,124 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "IAccessManagerExtended",
-  "sourceName": "contracts/shared/IAccessManagerExtended.sol",
+  "contractName": "IAccessAdmin",
+  "sourceName": "contracts/authorization/IAccessAdmin.sol",
   "abi": [
     {
       "inputs": [
         {
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "AccessManagerAlreadyScheduled",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "AccessManagerBadConfirmation",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
+          "internalType": "address",
+          "name": "authority",
+          "type": "address"
         }
       ],
-      "name": "AccessManagerExpired",
+      "name": "AccessManagedInvalidAuthority",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "initialAdmin",
+          "name": "caller",
           "type": "address"
+        },
+        {
+          "internalType": "uint32",
+          "name": "delay",
+          "type": "uint32"
         }
       ],
-      "name": "AccessManagerInvalidInitialAdmin",
+      "name": "AccessManagedRequiredDelay",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "account",
+          "name": "caller",
           "type": "address"
         }
       ],
-      "name": "AccessManagerLockedAccount",
+      "name": "AccessManagedUnauthorized",
       "type": "error"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "name": "AccessManagerLockedRole",
+      "inputs": [],
+      "name": "ErrorAccessAdminAccessManagerEmptyName",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
+          "internalType": "address",
+          "name": "authority",
+          "type": "address"
         }
       ],
-      "name": "AccessManagerNotReady",
+      "name": "ErrorAccessAdminAccessManagerNotAccessManager",
       "type": "error"
     },
     {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
-        }
-      ],
-      "name": "AccessManagerNotScheduled",
+      "inputs": [],
+      "name": "ErrorAccessAdminAdminRoleMissing",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "authorization",
+          "type": "address"
         }
       ],
-      "name": "AccessManagerRoleIdAlreadyExists",
+      "name": "ErrorAccessAdminAlreadyInitialized",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "authority",
+          "type": "address"
         }
       ],
-      "name": "AccessManagerRoleIdNotExists",
+      "name": "ErrorAccessAdminAuthorityNotContract",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
         }
       ],
-      "name": "AccessManagerRoleIdTooBig",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "AccessManagerRoleIdZero",
+      "name": "ErrorAccessAdminAuthorizeForAdminRoleInvalid",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "uint64",
-          "name": "newRoleId",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "authorization",
+          "type": "address"
         },
         {
-          "internalType": "uint64",
-          "name": "existingRoleId",
-          "type": "uint64"
+          "internalType": "ObjectType",
+          "name": "expectedDomain",
+          "type": "uint8"
         },
         {
-          "internalType": "string",
-          "name": "duplicateName",
-          "type": "string"
-        }
-      ],
-      "name": "AccessManagerRoleNameAlreadyExists",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "ObjectType",
+          "name": "actualDomain",
+          "type": "uint8"
         }
       ],
-      "name": "AccessManagerRoleNameEmpty",
+      "name": "ErrorAccessAdminDomainMismatch",
       "type": "error"
     },
     {
       "inputs": [],
-      "name": "AccessManagerTargetAddressZero",
+      "name": "ErrorAccessAdminFunctionNameEmpty",
       "type": "error"
     },
     {
@@ -166,9 +127,14 @@
           "internalType": "address",
           "name": "target",
           "type": "address"
+        },
+        {
+          "internalType": "enum IAccess.TargetType",
+          "name": "serviceTargetType",
+          "type": "uint8"
         }
       ],
-      "name": "AccessManagerTargetAlreadyExists",
+      "name": "ErrorAccessAdminInvalidServiceType",
       "type": "error"
     },
     {
@@ -179,606 +145,613 @@
           "type": "address"
         },
         {
-          "internalType": "address",
-          "name": "targetAuthority",
-          "type": "address"
+          "internalType": "enum IAccess.TargetType",
+          "name": "targetType",
+          "type": "uint8"
         }
       ],
-      "name": "AccessManagerTargetAuthorityInvalid",
+      "name": "ErrorAccessAdminInvalidTargetType",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorAccessAdminInvalidUserOfAdminRole",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorAccessAdminInvalidUserOfPublicRole",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "newTarget",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "adminRoleId",
+          "type": "uint64"
         },
         {
           "internalType": "address",
-          "name": "existingTarget",
+          "name": "account",
           "type": "address"
-        },
-        {
-          "internalType": "string",
-          "name": "duplicateName",
-          "type": "string"
         }
       ],
-      "name": "AccessManagerTargetNameAlreadyExists",
+      "name": "ErrorAccessAdminNotAdminOfRole",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "target",
+          "name": "authorization",
           "type": "address"
         }
       ],
-      "name": "AccessManagerTargetNameEmpty",
+      "name": "ErrorAccessAdminNotAuthorization",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorAccessAdminNotDeployer",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "target",
+          "name": "registerable",
           "type": "address"
         }
       ],
-      "name": "AccessManagerTargetNotExists",
+      "name": "ErrorAccessAdminNotRegistered",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "msgsender",
+          "name": "registry",
           "type": "address"
-        },
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
         }
       ],
-      "name": "AccessManagerUnauthorizedAccount",
+      "name": "ErrorAccessAdminNotRegistry",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         },
         {
           "internalType": "address",
-          "name": "target",
+          "name": "account",
           "type": "address"
-        },
-        {
-          "internalType": "bytes4",
-          "name": "selector",
-          "type": "bytes4"
         }
       ],
-      "name": "AccessManagerUnauthorizedCall",
+      "name": "ErrorAccessAdminNotRoleOwner",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "msgsender",
+          "name": "serviceAuthorization",
           "type": "address"
-        },
+        }
+      ],
+      "name": "ErrorAccessAdminNotServiceAuthorization",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "address",
-          "name": "caller",
+          "name": "authorization",
           "type": "address"
         },
         {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
+          "internalType": "VersionPart",
+          "name": "expectedRelease",
+          "type": "uint8"
         },
         {
-          "internalType": "bytes4",
-          "name": "selector",
-          "type": "bytes4"
+          "internalType": "VersionPart",
+          "name": "actualRelease",
+          "type": "uint8"
         }
       ],
-      "name": "AccessManagerUnauthorizedCancel",
+      "name": "ErrorAccessAdminReleaseMismatch",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "adminRoleId",
+          "type": "uint64"
         }
       ],
-      "name": "AccessManagerUnauthorizedConsume",
+      "name": "ErrorAccessAdminRoleAdminNotExisting",
       "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         },
         {
-          "indexed": false,
           "internalType": "string",
           "name": "name",
           "type": "string"
         }
       ],
-      "name": "LogRoleCreation",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleAlreadyCreated",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         }
       ],
-      "name": "LogTargetCreation",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleIsLocked",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "internalType": "uint32",
-          "name": "nonce",
-          "type": "uint32"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         }
       ],
-      "name": "OperationCanceled",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleIsPaused",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         },
         {
-          "indexed": true,
-          "internalType": "uint32",
-          "name": "nonce",
-          "type": "uint32"
+          "internalType": "address",
+          "name": "notContract",
+          "type": "address"
         }
       ],
-      "name": "OperationExecuted",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleMemberNotContract",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "bytes32",
-          "name": "operationId",
-          "type": "bytes32"
-        },
-        {
-          "indexed": true,
-          "internalType": "uint32",
-          "name": "nonce",
-          "type": "uint32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint48",
-          "name": "schedule",
-          "type": "uint48"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         },
         {
-          "indexed": false,
           "internalType": "address",
-          "name": "target",
+          "name": "expectedMember",
           "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
         }
       ],
-      "name": "OperationScheduled",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleMemberRemovalDisabled",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         },
         {
-          "indexed": true,
-          "internalType": "uint64",
-          "name": "admin",
-          "type": "uint64"
+          "internalType": "uint256",
+          "name": "memberCountLimit",
+          "type": "uint256"
         }
       ],
-      "name": "RoleAdminChanged",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleMembersLimitReached",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         },
         {
-          "indexed": false,
-          "internalType": "uint32",
-          "name": "delay",
-          "type": "uint32"
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
         },
         {
-          "indexed": false,
-          "internalType": "uint48",
-          "name": "since",
-          "type": "uint48"
+          "internalType": "RoleId",
+          "name": "existingRoleId",
+          "type": "uint64"
         }
       ],
-      "name": "RoleGrantDelayChanged",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleNameAlreadyExists",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint32",
-          "name": "delay",
-          "type": "uint32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint48",
-          "name": "since",
-          "type": "uint48"
-        },
-        {
-          "indexed": false,
-          "internalType": "bool",
-          "name": "newMember",
-          "type": "bool"
         }
       ],
-      "name": "RoleGranted",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleNameEmpty",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
-        },
-        {
-          "indexed": true,
-          "internalType": "uint64",
-          "name": "guardian",
-          "type": "uint64"
         }
       ],
-      "name": "RoleGuardianChanged",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleNotCustom",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
-        },
-        {
-          "indexed": false,
-          "internalType": "string",
-          "name": "label",
-          "type": "string"
         }
       ],
-      "name": "RoleLabel",
-      "type": "event"
+      "name": "ErrorAccessAdminRoleUnknown",
+      "type": "error"
     },
     {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
+      "inputs": [],
+      "name": "ErrorAccessAdminSelectorZero",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorAccessAdminTagetNotLockable",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "indexed": true,
           "internalType": "address",
-          "name": "account",
+          "name": "target",
           "type": "address"
+        },
+        {
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
         }
       ],
-      "name": "RoleRevoked",
-      "type": "event"
+      "name": "ErrorAccessAdminTargetAlreadyCreated",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
           "internalType": "address",
           "name": "target",
           "type": "address"
         },
         {
-          "indexed": false,
-          "internalType": "uint32",
-          "name": "delay",
-          "type": "uint32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint48",
-          "name": "since",
-          "type": "uint48"
+          "internalType": "bool",
+          "name": "isLocked",
+          "type": "bool"
         }
       ],
-      "name": "TargetAdminDelayUpdated",
-      "type": "event"
+      "name": "ErrorAccessAdminTargetAlreadyLocked",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
           "internalType": "address",
-          "name": "target",
+          "name": "expectedAuthority",
           "type": "address"
         },
         {
-          "indexed": false,
-          "internalType": "bool",
-          "name": "closed",
-          "type": "bool"
+          "internalType": "address",
+          "name": "actualAuthority",
+          "type": "address"
         }
       ],
-      "name": "TargetClosed",
-      "type": "event"
+      "name": "ErrorAccessAdminTargetAuthorityMismatch",
+      "type": "error"
     },
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
           "internalType": "address",
           "name": "target",
           "type": "address"
         },
         {
-          "indexed": false,
-          "internalType": "bytes4",
-          "name": "selector",
-          "type": "bytes4"
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
         },
         {
-          "indexed": true,
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "existingTarget",
+          "type": "address"
         }
       ],
-      "name": "TargetFunctionRoleUpdated",
-      "type": "event"
+      "name": "ErrorAccessAdminTargetNameAlreadyExists",
+      "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "caller",
+          "name": "target",
           "type": "address"
-        },
+        }
+      ],
+      "name": "ErrorAccessAdminTargetNameEmpty",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "address",
           "name": "target",
           "type": "address"
-        },
-        {
-          "internalType": "bytes4",
-          "name": "selector",
-          "type": "bytes4"
         }
       ],
-      "name": "canCall",
-      "outputs": [
+      "name": "ErrorAccessAdminTargetNotAccessManaged",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "bool",
-          "name": "allowed",
-          "type": "bool"
-        },
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorAccessAdminTargetNotCreated",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "uint32",
-          "name": "delay",
-          "type": "uint32"
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorAccessAdminTargetNotRegistered",
+      "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "caller",
+          "name": "target",
           "type": "address"
         },
+        {
+          "internalType": "ObjectType",
+          "name": "expectedType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "actualType",
+          "type": "uint8"
+        }
+      ],
+      "name": "ErrorAccessAdminTargetTypeMismatch",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "address",
           "name": "target",
           "type": "address"
-        },
+        }
+      ],
+      "name": "ErrorAccessAdminTargetUnknown",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "name": "cancel",
-      "outputs": [
+      "name": "ErrorNotRegistry",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
         {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
+          "indexed": false,
+          "internalType": "address",
+          "name": "authority",
+          "type": "address"
         }
       ],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "AuthorityUpdated",
+      "type": "event"
     },
     {
+      "anonymous": false,
       "inputs": [
         {
+          "indexed": false,
+          "internalType": "string",
+          "name": "admin",
+          "type": "string"
+        },
+        {
+          "indexed": false,
           "internalType": "address",
-          "name": "caller",
+          "name": "target",
           "type": "address"
         },
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "indexed": false,
+          "internalType": "string",
+          "name": "func",
+          "type": "string"
         }
       ],
-      "name": "consumeScheduledOp",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "LogAccessAdminFunctionGranted",
+      "type": "event"
     },
     {
+      "anonymous": false,
       "inputs": [
         {
-          "internalType": "uint64",
+          "indexed": false,
+          "internalType": "string",
+          "name": "admin",
+          "type": "string"
+        },
+        {
+          "indexed": false,
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         },
         {
+          "indexed": false,
+          "internalType": "enum IAccess.RoleType",
+          "name": "roleType",
+          "type": "uint8"
+        },
+        {
+          "indexed": false,
+          "internalType": "RoleId",
+          "name": "roleAdminId",
+          "type": "uint64"
+        },
+        {
+          "indexed": false,
           "internalType": "string",
-          "name": "roleName",
+          "name": "name",
           "type": "string"
         }
       ],
-      "name": "createRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "LogAccessAdminRoleCreated",
+      "type": "event"
     },
     {
+      "anonymous": false,
       "inputs": [
         {
+          "indexed": false,
+          "internalType": "string",
+          "name": "admin",
+          "type": "string"
+        },
+        {
+          "indexed": false,
           "internalType": "address",
-          "name": "target",
+          "name": "account",
           "type": "address"
         },
         {
+          "indexed": false,
           "internalType": "string",
-          "name": "name",
+          "name": "roleName",
           "type": "string"
         }
       ],
-      "name": "createTarget",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
+      "name": "LogAccessAdminRoleGranted",
+      "type": "event"
     },
     {
+      "anonymous": false,
       "inputs": [
         {
+          "indexed": false,
+          "internalType": "string",
+          "name": "admin",
+          "type": "string"
+        },
+        {
+          "indexed": false,
           "internalType": "address",
-          "name": "target",
+          "name": "account",
           "type": "address"
         },
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "indexed": false,
+          "internalType": "string",
+          "name": "roleName",
+          "type": "string"
         }
       ],
-      "name": "execute",
-      "outputs": [
+      "name": "LogAccessAdminRoleRevoked",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
         {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
+          "indexed": false,
+          "internalType": "string",
+          "name": "admin",
+          "type": "string"
+        },
+        {
+          "indexed": false,
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
+        },
+        {
+          "indexed": false,
+          "internalType": "bool",
+          "name": "managed",
+          "type": "bool"
+        },
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         }
       ],
-      "stateMutability": "payable",
-      "type": "function"
+      "name": "LogAccessAdminTargetCreated",
+      "type": "event"
     },
     {
       "inputs": [],
-      "name": "expiration",
+      "name": "authority",
       "outputs": [
         {
-          "internalType": "uint32",
+          "internalType": "address",
           "name": "",
-          "type": "uint32"
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -786,57 +759,57 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
         {
           "internalType": "address",
-          "name": "account",
+          "name": "target",
           "type": "address"
         }
       ],
-      "name": "getAccess",
+      "name": "authorizedFunctions",
       "outputs": [
         {
-          "internalType": "uint48",
-          "name": "",
-          "type": "uint48"
-        },
-        {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
-        },
-        {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
-        },
+          "internalType": "uint256",
+          "name": "numberOfFunctions",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "deployer",
+      "outputs": [
         {
-          "internalType": "uint48",
+          "internalType": "address",
           "name": "",
-          "type": "uint48"
+          "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
+      "inputs": [],
+      "name": "getAdminRole",
+      "outputs": [
         {
-          "internalType": "bytes32",
-          "name": "id",
-          "type": "bytes32"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         }
       ],
-      "name": "getNonce",
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getAuthorization",
       "outputs": [
         {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
+          "internalType": "contract IAuthorization",
+          "name": "authorization",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -845,16 +818,43 @@
     {
       "inputs": [
         {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "idx",
+          "type": "uint256"
         }
       ],
-      "name": "getRoleAdmin",
+      "name": "getAuthorizedFunction",
       "outputs": [
         {
-          "internalType": "uint64",
-          "name": "",
+          "components": [
+            {
+              "internalType": "Str",
+              "name": "name",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "Selector",
+              "name": "selector",
+              "type": "bytes4"
+            },
+            {
+              "internalType": "Timestamp",
+              "name": "createdAt",
+              "type": "uint40"
+            }
+          ],
+          "internalType": "struct IAccess.FunctionInfo",
+          "name": "func",
+          "type": "tuple"
+        },
+        {
+          "internalType": "RoleId",
+          "name": "roleId",
           "type": "uint64"
         }
       ],
@@ -862,38 +862,65 @@
       "type": "function"
     },
     {
-      "inputs": [
+      "inputs": [],
+      "name": "getLinkedNftId",
+      "outputs": [
         {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
+          "internalType": "NftId",
+          "name": "linkedNftId",
+          "type": "uint96"
         }
       ],
-      "name": "getRoleGrantDelay",
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getLinkedOwner",
       "outputs": [
         {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
+          "internalType": "address",
+          "name": "linkedOwner",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
+      "inputs": [],
+      "name": "getPublicRole",
+      "outputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         }
       ],
-      "name": "getRoleGuardian",
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getRegistry",
       "outputs": [
         {
-          "internalType": "uint64",
+          "internalType": "contract IRegistry",
           "name": "",
-          "type": "uint64"
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getRelease",
+      "outputs": [
+        {
+          "internalType": "VersionPart",
+          "name": "release",
+          "type": "uint8"
         }
       ],
       "stateMutability": "view",
@@ -902,15 +929,15 @@
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
         }
       ],
-      "name": "getRoleId",
+      "name": "getRoleForName",
       "outputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         }
@@ -921,15 +948,15 @@
     {
       "inputs": [
         {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
+          "internalType": "uint256",
+          "name": "idx",
+          "type": "uint256"
         }
       ],
       "name": "getRoleId",
       "outputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         }
@@ -940,7 +967,7 @@
     {
       "inputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         }
@@ -950,23 +977,38 @@
         {
           "components": [
             {
-              "internalType": "uint64",
-              "name": "id",
+              "internalType": "RoleId",
+              "name": "adminRoleId",
               "type": "uint64"
             },
             {
-              "internalType": "string",
-              "name": "name",
-              "type": "string"
+              "internalType": "enum IAccess.RoleType",
+              "name": "roleType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "uint32",
+              "name": "maxMemberCount",
+              "type": "uint32"
             },
             {
               "internalType": "Timestamp",
               "name": "createdAt",
               "type": "uint40"
+            },
+            {
+              "internalType": "Timestamp",
+              "name": "pausedAt",
+              "type": "uint40"
+            },
+            {
+              "internalType": "Str",
+              "name": "name",
+              "type": "bytes32"
             }
           ],
-          "internalType": "struct IAccessManagerExtended.RoleInfo",
-          "name": "",
+          "internalType": "struct IAccess.RoleInfo",
+          "name": "roleInfo",
           "type": "tuple"
         }
       ],
@@ -976,7 +1018,7 @@
     {
       "inputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         },
@@ -990,7 +1032,7 @@
       "outputs": [
         {
           "internalType": "address",
-          "name": "member",
+          "name": "account",
           "type": "address"
         }
       ],
@@ -999,88 +1041,18 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "name": "getRoleMembers",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "numberOfMembers",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRoles",
-      "outputs": [
         {
           "internalType": "uint256",
-          "name": "numberOfRoles",
+          "name": "idx",
           "type": "uint256"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "id",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getSchedule",
-      "outputs": [
-        {
-          "internalType": "uint48",
-          "name": "",
-          "type": "uint48"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
-        }
-      ],
       "name": "getTargetAddress",
       "outputs": [
         {
-          "internalType": "address",
-          "name": "targetAddress",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        }
-      ],
-      "name": "getTargetAdminDelay",
-      "outputs": [
-        {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -1089,22 +1061,17 @@
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes4",
-          "name": "selector",
-          "type": "bytes4"
+          "internalType": "Str",
+          "name": "name",
+          "type": "bytes32"
         }
       ],
-      "name": "getTargetFunctionRole",
+      "name": "getTargetForName",
       "outputs": [
         {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
+          "internalType": "address",
+          "name": "target",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -1123,14 +1090,19 @@
         {
           "components": [
             {
-              "internalType": "address",
-              "name": "taddress",
-              "type": "address"
+              "internalType": "Str",
+              "name": "name",
+              "type": "bytes32"
             },
             {
-              "internalType": "string",
-              "name": "name",
-              "type": "string"
+              "internalType": "enum IAccess.TargetType",
+              "name": "targetType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "RoleId",
+              "name": "roleId",
+              "type": "uint64"
             },
             {
               "internalType": "Timestamp",
@@ -1138,8 +1110,8 @@
               "type": "uint40"
             }
           ],
-          "internalType": "struct IAccessManagerExtended.TargetInfo",
-          "name": "",
+          "internalType": "struct IAccess.TargetInfo",
+          "name": "targetInfo",
           "type": "tuple"
         }
       ],
@@ -1147,52 +1119,45 @@
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
+      "inputs": [],
+      "name": "isConsumingScheduledOp",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
+          "internalType": "bytes4",
+          "name": "",
+          "type": "bytes4"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "isLocked",
+      "outputs": [
         {
-          "internalType": "uint32",
-          "name": "executionDelay",
-          "type": "uint32"
+          "internalType": "bool",
+          "name": "locked",
+          "type": "bool"
         }
       ],
-      "name": "grantRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
-        },
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
         }
       ],
-      "name": "hasRole",
+      "name": "isRoleActive",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "",
+          "name": "isActive",
           "type": "bool"
-        },
-        {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
         }
       ],
       "stateMutability": "view",
@@ -1201,27 +1166,22 @@
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         },
         {
           "internalType": "address",
-          "name": "target",
+          "name": "account",
           "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
         }
       ],
-      "name": "hashOperation",
+      "name": "isRoleAdmin",
       "outputs": [
         {
-          "internalType": "bytes32",
+          "internalType": "bool",
           "name": "",
-          "type": "bytes32"
+          "type": "bool"
         }
       ],
       "stateMutability": "view",
@@ -1230,16 +1190,16 @@
     {
       "inputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
         }
       ],
-      "name": "isRoleExists",
+      "name": "isRoleCustom",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "exists",
+          "name": "isCustom",
           "type": "bool"
         }
       ],
@@ -1249,12 +1209,17 @@
     {
       "inputs": [
         {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
+        },
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
         }
       ],
-      "name": "isRoleNameExists",
+      "name": "isRoleMember",
       "outputs": [
         {
           "internalType": "bool",
@@ -1273,11 +1238,11 @@
           "type": "address"
         }
       ],
-      "name": "isTargetClosed",
+      "name": "isTargetLocked",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "",
+          "name": "locked",
           "type": "bool"
         }
       ],
@@ -1287,16 +1252,16 @@
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
+          "internalType": "RoleId",
+          "name": "roleId",
+          "type": "uint64"
         }
       ],
-      "name": "isTargetExists",
+      "name": "roleExists",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "",
+          "name": "exists",
           "type": "bool"
         }
       ],
@@ -1307,15 +1272,15 @@
       "inputs": [
         {
           "internalType": "string",
-          "name": "name",
+          "name": "roleName",
           "type": "string"
         }
       ],
-      "name": "isTargetNameExists",
+      "name": "roleExists",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "",
+          "name": "exists",
           "type": "bool"
         }
       ],
@@ -1325,66 +1290,44 @@
     {
       "inputs": [
         {
-          "internalType": "uint64",
+          "internalType": "RoleId",
           "name": "roleId",
           "type": "uint64"
-        },
-        {
-          "internalType": "string",
-          "name": "label",
-          "type": "string"
         }
       ],
-      "name": "labelRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "minSetback",
+      "name": "roleMembers",
       "outputs": [
         {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
+          "internalType": "uint256",
+          "name": "numberOfMembers",
+          "type": "uint256"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
+      "inputs": [],
+      "name": "roles",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "callerConfirmation",
-          "type": "address"
+          "internalType": "uint256",
+          "name": "numberOfRoles",
+          "type": "uint256"
         }
       ],
-      "name": "renounceRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
         {
           "internalType": "address",
-          "name": "account",
+          "name": "",
           "type": "address"
         }
       ],
-      "name": "revokeRole",
+      "name": "setAuthority",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1395,163 +1338,30 @@
           "internalType": "address",
           "name": "target",
           "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint48",
-          "name": "when",
-          "type": "uint48"
         }
       ],
-      "name": "schedule",
+      "name": "targetExists",
       "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "uint32",
-          "name": "",
-          "type": "uint32"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
-        {
-          "internalType": "uint32",
-          "name": "newDelay",
-          "type": "uint32"
-        }
-      ],
-      "name": "setGrantDelay",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
-        {
-          "internalType": "uint64",
-          "name": "admin",
-          "type": "uint64"
-        }
-      ],
-      "name": "setRoleAdmin",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        },
-        {
-          "internalType": "uint64",
-          "name": "guardian",
-          "type": "uint64"
-        }
-      ],
-      "name": "setRoleGuardian",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "uint32",
-          "name": "newDelay",
-          "type": "uint32"
-        }
-      ],
-      "name": "setTargetAdminDelay",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
         {
           "internalType": "bool",
-          "name": "closed",
+          "name": "exists",
           "type": "bool"
         }
       ],
-      "name": "setTargetClosed",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes4[]",
-          "name": "selectors",
-          "type": "bytes4[]"
-        },
-        {
-          "internalType": "uint64",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "name": "setTargetFunctionRole",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "targets",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "newAuthority",
-          "type": "address"
+          "internalType": "uint256",
+          "name": "numberOfTargets",
+          "type": "uint256"
         }
       ],
-      "name": "updateAuthority",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     }
   ],