Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
howydev committed Jan 30, 2024
1 parent 3a96ad5 commit ea973a2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/account/UpgradeableModularAccount.sol
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import {PluginManagerInternals} from "./PluginManagerInternals.sol";

/// @title Upgradeable Modular Account
/// @author Alchemy
/// @notice A modular smart contract account that supports upgradeability and plugins.
/// @notice A modular smart contract account (MSCA) that supports upgradeability and plugins.
contract UpgradeableModularAccount is
AccountExecutor,
AccountLoupe,
Expand Down
4 changes: 2 additions & 2 deletions src/factory/MultiOwnerMAFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import {FactoryHelpers} from "../helpers/FactoryHelpers.sol";
import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol";
import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";

/// @title Multi Owner Plugin MA Factory
/// @title Multi Owner Plugin Modular Account Factory
/// @author Alchemy
/// @notice Factory for upgradeable modular accounts with MultiOwnerPlugin installed.
/// @dev There is a reliance on the assumption that the plugin manifest will remain static, following ERC-6900. If
/// this assumption is broken then account deployments would be bricked.
contract MultiOwnerMAFactory is Ownable2Step {
contract MultiOwnerModularAccountFactory is Ownable2Step {
IEntryPoint public immutable ENTRYPOINT;
address public immutable MULTI_OWNER_PLUGIN;
address public immutable IMPL;
Expand Down
6 changes: 3 additions & 3 deletions src/interfaces/IPlugin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum ManifestAssociatedFunctionType {
}
// forgefmt: disable-end

/// @dev For functions of type `ManifestAssociatedFunctionType.DEPENDENCY`, the MA MUST find the plugin address
/// @dev For functions of type `ManifestAssociatedFunctionType.DEPENDENCY`, the MSCA MUST find the plugin address
/// of the function at `dependencies[dependencyIndex]` during the call to `installPlugin(config)`.
struct ManifestFunction {
ManifestAssociatedFunctionType functionType;
Expand Down Expand Up @@ -86,9 +86,9 @@ struct PluginManifest {
// provided here, with its position in the array matching the `dependencyIndex` members of `ManifestFunction`
// structs used in the manifest.
bytes4[] dependencyInterfaceIds;
// Execution functions defined in this plugin to be installed on the MA.
// Execution functions defined in this plugin to be installed on the MSCA.
bytes4[] executionFunctions;
// Plugin execution functions already installed on the MA that this plugin will be able to call.
// Plugin execution functions already installed on the MSCA that this plugin will be able to call.
bytes4[] permittedExecutionSelectors;
// Boolean to indicate whether the plugin can call any external address.
bool permitAnyExternalAddress;
Expand Down
1 change: 1 addition & 0 deletions src/plugins/owner/IMultiOwnerPlugin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ interface IMultiOwnerPlugin {
enum FunctionId {
RUNTIME_VALIDATION_OWNER_OR_SELF, // require owner or self access
USER_OP_VALIDATION_OWNER // require owner access

}

/// @notice This event is emitted when owners of the account are updated.
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/session/ISessionKeyPlugin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import {UserOperation} from "../../interfaces/erc4337/UserOperation.sol";
import {Call} from "../../interfaces/IStandardExecutor.sol";

interface ISessionKeyPlugin {
enum FunctionId {USER_OP_VALIDATION_SESSION_KEY}
enum FunctionId {
USER_OP_VALIDATION_SESSION_KEY
}

// Valid access control types for contract access control lists.
enum ContractAccessControlType {
Expand Down

0 comments on commit ea973a2

Please sign in to comment.