-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/VEN-2904
- Loading branch information
Showing
138 changed files
with
61,944 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| pragma solidity 0.8.25; | ||
|
|
||
| import { IAccessControlManagerV8 } from "../Governance/IAccessControlManagerV8.sol"; | ||
| import { ensureNonzeroAddress } from "@venusprotocol/solidity-utilities/contracts/validators.sol"; | ||
|
|
||
| /** | ||
| * @title ACMCommandsAggregator | ||
| * @author Venus | ||
| * @notice This contract is a helper to aggregate multiple grant and revoke permissions in batches and execute them in one go. | ||
| */ | ||
| contract ACMCommandsAggregator { | ||
| /* | ||
| * @notice Struct to store permission details | ||
| */ | ||
| struct Permission { | ||
| /* | ||
| * @notice Address of the contract | ||
| */ | ||
| address contractAddress; | ||
| /* | ||
| * @notice Function signature | ||
| */ | ||
| string functionSig; | ||
| /* | ||
| * @notice Address of the account | ||
| */ | ||
| address account; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Access control manager contract | ||
| */ | ||
| IAccessControlManagerV8 public immutable ACM; | ||
|
|
||
| /* | ||
| * @notice 2D array to store grant permissions in batches | ||
| */ | ||
| Permission[][] public grantPermissions; | ||
|
|
||
| /* | ||
| * @notice 2D array to store revoke permissions in batches | ||
| */ | ||
| Permission[][] public revokePermissions; | ||
|
|
||
| /* | ||
| * @notice Event emitted when grant permissions are added | ||
| */ | ||
| event GrantPermissionsAdded(uint256 index); | ||
|
|
||
| /* | ||
| * @notice Event emitted when revoke permissions are added | ||
| */ | ||
| event RevokePermissionsAdded(uint256 index); | ||
|
|
||
| /* | ||
| * @notice Event emitted when grant permissions are executed | ||
| */ | ||
| event GrantPermissionsExecuted(uint256 index); | ||
|
|
||
| /* | ||
| * @notice Event emitted when revoke permissions are executed | ||
| */ | ||
| event RevokePermissionsExecuted(uint256 index); | ||
|
|
||
| /* | ||
| * @notice Error to be thrown when permissions are empty | ||
| */ | ||
| error EmptyPermissions(); | ||
|
|
||
| /* | ||
| * @notice Constructor to set the access control manager | ||
| * @param _acm Address of the access control manager | ||
| */ | ||
| constructor(IAccessControlManagerV8 _acm) { | ||
| ensureNonzeroAddress(address(_acm)); | ||
| ACM = _acm; | ||
| } | ||
|
|
||
| /* | ||
| * @notice Function to add grant permissions | ||
| * @param _permissions Array of permissions | ||
| * @custom:event Emits GrantPermissionsAdded event | ||
| */ | ||
| function addGrantPermissions(Permission[] memory _permissions) external { | ||
| if (_permissions.length == 0) { | ||
| revert EmptyPermissions(); | ||
| } | ||
|
|
||
| uint256 index = grantPermissions.length; | ||
| grantPermissions.push(); | ||
|
|
||
| for (uint256 i; i < _permissions.length; ++i) { | ||
| grantPermissions[index].push( | ||
| Permission(_permissions[i].contractAddress, _permissions[i].functionSig, _permissions[i].account) | ||
| ); | ||
| } | ||
|
|
||
| emit GrantPermissionsAdded(index); | ||
| } | ||
|
|
||
| /* | ||
| * @notice Function to add revoke permissions | ||
| * @param _permissions Array of permissions | ||
| * @custom:event Emits RevokePermissionsAdded event | ||
| */ | ||
| function addRevokePermissions(Permission[] memory _permissions) external { | ||
| if (_permissions.length == 0) { | ||
| revert EmptyPermissions(); | ||
| } | ||
|
|
||
| uint256 index = revokePermissions.length; | ||
| revokePermissions.push(); | ||
|
|
||
| for (uint256 i; i < _permissions.length; ++i) { | ||
| revokePermissions[index].push( | ||
| Permission(_permissions[i].contractAddress, _permissions[i].functionSig, _permissions[i].account) | ||
| ); | ||
| } | ||
|
|
||
| emit RevokePermissionsAdded(index); | ||
| } | ||
|
|
||
| /* | ||
| * @notice Function to execute grant permissions | ||
| * @param index Index of the permissions array | ||
| * @custom:event Emits GrantPermissionsExecuted event | ||
| */ | ||
| function executeGrantPermissions(uint256 index) external { | ||
| uint256 length = grantPermissions[index].length; | ||
| for (uint256 i; i < length; ++i) { | ||
| Permission memory permission = grantPermissions[index][i]; | ||
| ACM.giveCallPermission(permission.contractAddress, permission.functionSig, permission.account); | ||
| } | ||
|
|
||
| emit GrantPermissionsExecuted(index); | ||
| } | ||
|
|
||
| /* | ||
| * @notice Function to execute revoke permissions | ||
| * @param index Index of the permissions array | ||
| * @custom:event Emits RevokePermissionsExecuted event | ||
| */ | ||
| function executeRevokePermissions(uint256 index) external { | ||
| uint256 length = revokePermissions[index].length; | ||
| for (uint256 i; i < length; ++i) { | ||
| Permission memory permission = revokePermissions[index][i]; | ||
| ACM.revokeCallPermission(permission.contractAddress, permission.functionSig, permission.account); | ||
| } | ||
|
|
||
| emit RevokePermissionsExecuted(index); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { ethers } from "hardhat"; | ||
| import { DeployFunction } from "hardhat-deploy/types"; | ||
| import { HardhatRuntimeEnvironment } from "hardhat/types"; | ||
|
|
||
| const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { | ||
| const { deployments, getNamedAccounts } = hre; | ||
| const { deploy } = deployments; | ||
| const { deployer } = await getNamedAccounts(); | ||
|
|
||
| const acm = await ethers.getContract("AccessControlManager"); | ||
|
|
||
| await deploy("ACMCommandsAggregator", { | ||
| contract: "ACMCommandsAggregator", | ||
| from: deployer, | ||
| args: [acm.address], | ||
| log: true, | ||
| autoMine: true, | ||
| }); | ||
| }; | ||
|
|
||
| func.tags = ["ACMCommandsAggregator"]; | ||
|
|
||
| export default func; |
Oops, something went wrong.