edits to address reviewer comments

Author: alexandratran

delegation-toolkit/concepts/delegation/index.md

@@ -22,24 +22,22 @@ For example: Alice delegates the ability to spend her USDC to Bob, limiting the
 
 The delegation lifecycle is as follows:
 
-1. **Create a delegation** - The delegator account creates and signs a delegation.
-
-2. **Apply caveats** - The caveats applied to the delegation specify conditions under which
-   the delegation can be redeemed.
+1. **Create a delegation** - The delegator account creates a delegation, applying *caveats* which specify conditions under which the delegation can be redeemed.
+  The delegator signs the delegation.
 
 3. **Store the delegation** - A dapp can store the delegation, enabling retrieval for future redemption.
 
 4. **Redeem the delegation** - The delegate (the account being granted the permission) redeems the delegation via the Delegation Manager,
    which verifies that the delegated authority is valid in order to perform the execution.
 
-See [how to perform executions on a user's behalf](../../guides/delegation/execute-on-users-behalf.md) to get started with the delegation lifecycle.
+See [how to perform executions on a smart account's behalf](../../guides/delegation/execute-on-smart-accounts-behalf.md) to get started with the delegation lifecycle.
 
 ## Delegation types
 
 You can create the following delegation types:
 
-- **Root delegation** - A root delegation is a delegation that doesn't derive its authority from another delegation.
-  It is when a delegator delegates its own authority away.
+- **Root delegation** - A root delegation is when a delegator delegates their own authority away, as opposed to *redelegating* permissions they received from a previous delegation.
+  In a chain of delegations, the first delegation is the root delegation.
   For example, Alice delegates the ability to spend her USDC to Bob, limiting the amount to 100 USDC.
 
   Use [`createDelegation`](../../reference/api/delegation.md#createdelegation) to create a root delegation.
@@ -49,7 +47,7 @@ You can create the following delegation types:
   For example, Alice delegates the ability to spend 100 of her USDC to anyone.
 
   You must create open root delegations carefully, to ensure that they are not misused.
-  Use [`createOpenDelegation`](../../reference/api/delegation.md#createopendelegation) to create a root delegation.
+  Use [`createOpenDelegation`](../../reference/api/delegation.md#createopendelegation) to create an open root delegation.
 
 - **Redelegation** - A delegate can redelegate permissions that have been granted to them, creating a chain of delegations across trusted parties.
   For example, Alice delegates the ability to spend 100 of her USDC to Bob.
@@ -87,18 +85,18 @@ It consists of the following components:
 
   1. Validates the input data by ensuring the lengths of `delegations`, `modes`, and
      `executions` match.
-	2. Decodes and validates the delegation, checking that the caller is the delegate
+  2. Decodes and validates the delegation, checking that the caller is the delegate
      and that there are no empty signatures.
-	3. Verifies delegation signatures, ensuring validity using ECDSA (for EOAs) or
+  3. Verifies delegation signatures, ensuring validity using ECDSA (for EOAs) or
      `isValidSignature` (for contracts).
-	4. Validates the delegation chain's authority and ensures delegations are not disabled.
-	5. Executes the `beforeHook` for each [caveat](caveat-enforcers.md) in the delegation, passing relevant data (`terms`,
+  4. Validates the delegation chain's authority and ensures delegations are not disabled.
+  5. Executes the `beforeHook` for each [caveat](caveat-enforcers.md) in the delegation, passing relevant data (`terms`,
      `arguments`, `mode`, `execution` `calldata`, and `delegationHash`) to the caveat enforcer.
-	6. Calls `executeFromExecutor` to perform the delegation's execution, either by the delegator or
+  6. Calls `executeFromExecutor` to perform the delegation's execution, either by the delegator or
      the caller for self-authorized executions.
-	7. Executes the `afterHook` for each caveat, similar to the `beforeHook`, passing required data
+  7. Executes the `afterHook` for each caveat, similar to the `beforeHook`, passing required data
      to enforce post-execution conditions.
-	8. Emits `RedeemedDelegation` events for each delegation that was successfully redeemed.
+  8. Emits `RedeemedDelegation` events for each delegation that was successfully redeemed.
 
 - **Caveat enforcers** - [Caveat enforcers](caveat-enforcers.md) manage rules and restrictions for delegations,
   providing fine-tuned control over delegated executions.
@@ -154,32 +152,29 @@ sequenceDiagram
 ## Execution modes
 
 When redeeming a delegation using [`redeemDelegations`](../../reference/api/delegation.md#redeemdelegations), you must pass an execution mode for each delegation chain you pass to the method.
-The Delegation Toolkit supports several execution modes based on [ERC-7579](https://erc7579.com/): `SINGLE_DEFAULT_MODE`, `SINGLE_TRY_MODE`, `BATCH_DEFAULT_MODE`, and `BATCH_TRY_MODE`.
+The Delegation Toolkit supports the following execution modes, based on [ERC-7579](https://erc7579.com/):
+
+| Execution mode | Number of delegation chains passed to `redeemDelegations` | Processing method | Does user operation continue execution if redemption reverts? |
+|--|--|--|--|
+| `SINGLE_DEFAULT_MODE` | One      | Sequential  | No  |
+| `SINGLE_TRY_MODE`     | One      | Sequential  | Yes |
+| `BATCH_DEFAULT_MODE`  | Multiple | Interleaved | No  |
+| `BATCH_TRY_MODE`      | Multiple | Interleaved | Yes |
 
-### `SINGLE` execution modes
+### Sequential processing
 
-In `SINGLE` modes, you can provide only one delegation chain and one execution.
-Processing is sequential:
+In `SINGLE` modes, processing is sequential:
 
 1. For each delegation in the chain, all caveats' `before` hooks are called.
 2. The single redeemed action is executed.
 3. For each delegation in the chain, all caveats' `after` hooks are called.
 
-### `BATCH` execution modes
+### Interleaved processing
 
-In `BATCH` modes, you can provide multiple delegation chains and multiple executions.
-Processing is interleaved:
+In `BATCH` modes, processing is interleaved:
 
 1. For each chain in the batch, and each delegation in the chain, all caveats' `before` hooks are called.
 2. Each redeemed action is executed.
 3. For each chain in the batch, and each delegation in the chain, all caveats' `after` hooks are called.
 
 `BATCH` mode allows for powerful use cases, but the Delegation Framework currently does not include any `BATCH` compatible caveat enforcers.
-
-### `DEFAULT` modes
-
-In `DEFAULT` modes, if a revert occurs during redemption, the entire user operation reverts at that point.
-
-### `TRY` modes
-
-In `TRY` modes, if a revert occurs during redemption, execution of the user operation continues.

delegation-toolkit/get-started/smart-account-quickstart/eip7702.md

@@ -156,6 +156,6 @@ const userOperationHash = await bundlerClient.sendUserOperation({
 
 ## Next steps
 
-- To grant specific permissions to other accounts from your smart account, [create a delegation](../../guides/delegation/execute-on-users-behalf.md).
+- To grant specific permissions to other accounts from your smart account, [create a delegation](../../guides/delegation/execute-on-smart-accounts-behalf.md).
 - To quickly bootstrap a MetaMask Smart Accounts project, [use the CLI](../use-the-cli.md).
 - You can also [use MetaMask SDK to upgrade a MetaMask account to a smart account](/sdk/tutorials/upgrade-eoa-to-smart-account).

delegation-toolkit/get-started/smart-account-quickstart/index.md

@@ -94,7 +94,7 @@ const userOperationHash = await bundlerClient.sendUserOperation({
 
 ## Next steps
 
-- To grant specific permissions to other accounts from your smart account, [create a delegation](../../guides/delegation/execute-on-users-behalf.md).
+- To grant specific permissions to other accounts from your smart account, [create a delegation](../../guides/delegation/execute-on-smart-accounts-behalf.md).
 - This quickstart example uses a Hybrid smart account.
   You can also [configure other smart account types](../../guides/smart-accounts/create-smart-account.md).
 - To upgrade an EOA to a smart account, see the [EIP-7702 quickstart](eip7702.md).

…es/delegation/execute-on-users-behalf.md …tion/execute-on-smart-accounts-behalf.mddelegation-toolkit/guides/delegation/execute-on-users-behalf.md renamed to delegation-toolkit/guides/delegation/execute-on-smart-accounts-behalf.md delegation-toolkit/guides/delegation/execute-on-users-behalf.md renamed to delegation-toolkit/guides/delegation/execute-on-smart-accounts-behalf.md

@@ -1,13 +1,13 @@
 ---
-description: Use delegations to perform executions on a user's behalf.
+description: Use delegations to perform executions on a smart account's behalf.
 sidebar_position: 1
-sidebar_label: Execute on a user's behalf
+sidebar_label: Execute on a smart account's behalf
 ---
 
 import Tabs from "@theme/Tabs"; 
 import TabItem from "@theme/TabItem";
 
-# Perform executions on a user's behalf
+# Perform executions on a smart account's behalf
 
 [Delegation](../../concepts/delegation/index.md) is the ability for a [MetaMask smart account](../../concepts/smart-accounts.md) to grant permission to another account to perform executions on its behalf.
 
@@ -54,8 +54,8 @@ const bundlerClient = createBundlerClient({
 Create an account to represent Alice, the delegator who will create a delegation.
 The delegator must be a MetaMask smart account; use the toolkit's [`toMetaMaskSmartAccount`](../../reference/api/smart-account.md#tometamasksmartaccount) method to create the delegator account.
 
-This example configures a Hybrid smart account,
-which is a flexible smart account implementation that supports both an externally owned account (EOA) owner and any number of P256 (passkey) signers:
+A Hybrid smart account is a flexible smart account implementation that supports both an externally owned account (EOA) owner and any number of P256 (passkey) signers.
+This examples configures a [Hybrid smart account with an Account signatory](../smart-accounts/create-smart-account.md#create-a-hybrid-smart-account-with-an-account-signatory):
 
 ```typescript
 import { Implementation, toMetaMaskSmartAccount } from "@metamask/delegation-toolkit"
@@ -121,8 +121,7 @@ export const delegateWalletClient = createWalletClient({
 ### 5. Create a delegation
 
 Create a [root delegation](../../concepts/delegation/index.md#delegation-types) from Alice to Bob.
-A root delegation is a delegation that doesn't derive its authority from another delegation.
-Alice is delegating her own authority away, as opposed to *redelegating* permissions she received from a previous delegation.
+With a root delegation, Alice is delegating her own authority away, as opposed to *redelegating* permissions she received from a previous delegation.
 
 Use the toolkit's [`createDelegation`](../../reference/api/delegation.md#createdelegation) method to create a root delegation.
 This example passes an empty `caveats` array, which means Bob can perform any action on Alice's behalf. We recommend [restricting the delegation](restrict-delegation.md) by adding caveat enforcers.
@@ -162,7 +161,9 @@ const signedDelegation = {
 ### 7. Redeem the delegation
 
 Bob can now redeem the delegation. The redeem transaction is sent to the `DelegationManager` contract, which validates the delegation and executes actions on Alice's behalf.
+
 To prepare the calldata for the redeem transaction, use the [`redeemDelegations`](../../reference/api/delegation.md#redeemdelegations) method from `DelegationManager`.
+Since Bob is redeeming a single delegation chain, use the [`SINGLE_DEFAULT_MODE`](../../concepts/delegation/index.md#execution-modes) execution mode.
 
 Bob can redeem the delegation by submitting a user operation if his account is a smart account, or a regular transaction if his account is an EOA:
 
@@ -226,8 +227,3 @@ const transactionHash = await delegateWalletClient.sendTransaction({
 
 </TabItem>
 </Tabs>
-
-:::note
-`SINGLE_DEFAULT_MODE` is the default execution mode.
-Learn about the different [execution modes](../../concepts/delegation/index.md#execution-modes).
-:::

delegation-toolkit/guides/smart-accounts/create-smart-account.md

@@ -23,7 +23,7 @@ You can create a Hybrid smart account with the following types of signatories.
 
 ### Create a Hybrid smart account with an Account signatory
 
-Use [`toMetaMaskSmartAccount`](../../reference/api/smart-account.md#tometamasksmartaccount) and Viem's [`privateKeyToAccount`](https://viem.sh/docs/accounts/local/privateKeyToAccount) to create a Hybrid smart account with a signatory from a private key:
+Use [`toMetaMaskSmartAccount`](../../reference/api/smart-account.md#tometamasksmartaccount), and Viem's [`privateKeyToAccount` and `generatePrivateKey`](https://viem.sh/docs/accounts/local/privateKeyToAccount), to create a Hybrid smart account with a signatory from a randomly generated private key:
 
 <Tabs>
 <TabItem value="example.ts">
@@ -415,5 +415,5 @@ With a MetaMask smart account, you can perform the following functions:
 
 - In conjunction with [Viem Account Abstraction clients](../configure.md), deploy the smart account
   and [send user operations](send-user-operation.md).
-- [Create delegations](../delegation/execute-on-users-behalf.md) that can be used to grant specific rights and permissions to other accounts.
+- [Create delegations](../delegation/execute-on-smart-accounts-behalf.md) that can be used to grant specific rights and permissions to other accounts.
   Smart accounts that create delegations are called *delegator accounts*.

vercel.json

@@ -732,15 +732,15 @@
     },
     {
       "source": "/delegation-toolkit/development/how-to/create-delegation/",
-      "destination": "/delegation-toolkit/development/guides/delegation/execute-on-users-behalf/"
+      "destination": "/delegation-toolkit/development/guides/delegation/execute-on-smart-accounts-behalf/"
     },
     {
       "source": "/delegation-toolkit/development/how-to/create-delegation/:path*/",
       "destination": "/delegation-toolkit/development/guides/delegation/:path*/"
     },
     {
       "source": "/delegation-toolkit/development/how-to/redeem-delegation/",
-      "destination": "/delegation-toolkit/development/guides/delegation/execute-on-users-behalf/"
+      "destination": "/delegation-toolkit/development/guides/delegation/execute-on-smart-accounts-behalf/"
     },
     {
       "source": "/delegation-toolkit/development/get-started/quickstart/",