Merge remote-tracking branch 'origin/main' into bundler

Author: bgravenorst

.github/CODEOWNERS

@@ -3,21 +3,3 @@
 
 # Default owner for all other files
 * @MetaMask/dashboard @MetaMask/tech-writers @MetaMask/delegation-devrel @MetaMask/embedded-wallets-devrel @MetaMask/sdk-devrel
-
-# Developer tools documentation
-/developer-tools/ @MetaMask/tech-writers
-
-# Services documentation
-/services/ @MetaMask/tech-writers
-
-# Snaps documentation
-/snaps/ @MetaMask/tech-writers @MetaMask/snaps
-
-# Delegation Toolkit documentation
-/delegation-toolkit/ @MetaMask/tech-writers @MetaMask/delegation @MetaMask/delegation-devrel
-
-# SDK documentation
-/sdk/ @MetaMask/tech-writers @MetaMask/sdk-devs @MetaMask/sdk-devrel
-
-# Wallet documentation
-/wallet/ @MetaMask/tech-writers @MetaMask/wallet-api-platform-engineers

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,3 +11,10 @@ Fixes #
 ## Preview
 
 <!-- Provide a PR preview link to the page(s) changed. -->
+
+## Checklist
+
+<!-- Complete the following checklist before merging your PR. -->
+
+- [ ] If this PR updates or adds documentation content that changes or adds technical meaning, it has received an approval from an engineer or DevRel from the relevant team.
+- [ ] If this PR updates or adds documentation content, it has received an approval from a technical writer.

delegation-toolkit/concepts/delegation/caveat-enforcers.md

@@ -1,5 +1,6 @@
 ---
 description: Learn about caveat enforcers and how they restrict delegations.
+keywords: [caveats, caveat enforcers, delegation]
 ---
 
 # Caveat enforcers
@@ -118,23 +119,23 @@ This "all-or-nothing" approach ensures that delegations only execute exactly as
 
 ## Caveat builder
 
-While caveat enforcers operate at the smart contract level, most developers interact with them through the [`CaveatBuilder`](../../guides/delegation/restrict-delegation.md) interface in the MetaMask Delegation Toolkit.
+While caveat enforcers operate at the smart contract level, most developers interact with them through the `CaveatBuilder` interface in the MetaMask Delegation Toolkit.
 
 The `CaveatBuilder` provides a developer-friendly TypeScript API that:
 
 - Abstracts away the complexity of correctly formatting and encoding caveat terms.
 - Provides type-checking and validation for caveat parameters.
 - Handles the creation of the `caveats` array needed when creating a delegation.
 
-Each [caveat type](../../reference/caveats.md) in the `CaveatBuilder`
+Each [caveat type](../../reference/delegation/caveats.md) in the `CaveatBuilder`
 corresponds to a specific caveat enforcer contract. For example, when you use:
 
 ```typescript
 caveatBuilder.addCaveat("allowedTargets", ["0xc11F3a8E5C7D16b75c9E2F60d26f5321C6Af5E92"]);
 ```
 
 The builder is creating a caveat that references the
-[`AllowedTargetsEnforcer`](../../reference/caveats.md#allowedtargets) contract address and
+[`AllowedTargetsEnforcer`](../../reference/delegation/caveats.md#allowedtargets) contract address and
 properly encodes the provided addresses as terms for that enforcer.
 
 ## Caveat enforcer best practices
@@ -144,14 +145,14 @@ When designing delegations with caveats, consider these best practices:
 - **Combine caveat enforcers appropriately** - Use multiple caveat enforcers to create comprehensive restrictions.
 
 - **Consider caveat enforcer order** - When using caveat enforcers that modify external contract states, the order matters.
-  For example, using [`NativeTokenPaymentEnforcer`](../../reference/caveats.md#nativetokenpayment) before
-  [`NativeBalanceChangeEnforcer`](../../reference/caveats.md#nativebalancechange) might cause validation failures.
+  For example, using [`NativeTokenPaymentEnforcer`](../../reference/delegation/caveats.md#nativetokenpayment) before
+  [`NativeBalanceChangeEnforcer`](../../reference/delegation/caveats.md#nativebalancechange) might cause validation failures.
 
 - **Be careful with unbounded delegations** - Always include appropriate caveat enforcers to limit what a delegate can do.
 
 ## Available caveat enforcers
 
-The Delegation Toolkit provides [out-of-the-box caveat enforcers](../../reference/caveats.md)
+The Delegation Toolkit provides [out-of-the-box caveat enforcers](../../reference/delegation/caveats.md)
 for common restriction patterns, including:
 
 - Limiting target addresses and methods.

delegation-toolkit/concepts/delegation/index.md

@@ -1,6 +1,7 @@
 ---
 description: Learn about delegation, the delegation lifecycle, and the Delegation Framework.
 toc_max_heading_level: 2
+keywords: [delegation toolkit, delegation, delegator, delegate, delegation framework]
 ---
 
 import Tabs from "@theme/Tabs"; 
@@ -39,28 +40,28 @@ You can create the following delegation types:
   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.
+  Use [`createDelegation`](../../reference/delegation/index.md#createdelegation) to create a root delegation.
 
 - **Open root delegation** - An open root delegation is a root delegation that doesn't specify a delegate.
   This means that any account can redeem the delegation.
   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 an open root delegation.
+  Use [`createOpenDelegation`](../../reference/delegation/index.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.
   Bob redelegates the ability to spend 50 of Alice's 100 USDC to Carol.
 
-  Use [`createDelegation`](../../reference/api/delegation.md#createdelegation) to create a redelegation.
+  Use [`createDelegation`](../../reference/delegation/index.md#createdelegation) to create a redelegation.
 
 - **Open redelegation** - An open redelegation is a redelegation that doesn't specify a delegate.
   This means that any account can redeem the redelegation.
   For example, Alice delegates the ability to spend 100 of her USDC to Bob.
   Bob redelegates the ability to spend 50 of Alice's 100 USDC to anyone.
 
   As with open root delegations, you must create open redelegations carefully, to ensure that they are not misused.
-  Use [`createOpenDelegation`](../../reference/api/delegation.md#createopendelegation) to create an open redelegation.
+  Use [`createOpenDelegation`](../../reference/delegation/index.md#createopendelegation) to create an open redelegation.
 
 ## Delegation Framework
 
@@ -79,7 +80,7 @@ It consists of the following components:
 - **Delegation Manager** - The Delegation Manager validates delegations and triggers executions
   on behalf of the delegator, ensuring tasks are executed accurately and securely.
 
-  When you redeem a delegation using [`redeemDelegations`](../../reference/api/delegation.md#redeemdelegations), the Delegation Manager performs the following steps.
+  When you redeem a delegation using [`redeemDelegations`](../../reference/delegation/index.md#redeemdelegations), the Delegation Manager performs the following steps.
   It processes a single step for all redemptions before proceeding to the next one:
 
   1. Validates the input data by ensuring the lengths of `delegations`, `modes`, and
@@ -150,30 +151,30 @@ 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.
+When redeeming a delegation using [`redeemDelegations`](../../reference/delegation/index.md#redeemdelegations), you must pass an execution mode for each delegation chain you pass to the method.
 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 |
+| `SingleDefault` | One      | Sequential  | No  |
+| `SingleTry`     | One      | Sequential  | Yes |
+| `BatchDefault`  | Multiple | Interleaved | No  |
+| `BatchTry`      | Multiple | Interleaved | Yes |
 
 ### Sequential processing
 
-In `SINGLE` modes, 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.
 
 ### Interleaved processing
 
-In `BATCH` modes, 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.
+`Batch` mode allows for powerful use cases, but the Delegation Framework currently does not include any `Batch` compatible caveat enforcers.

delegation-toolkit/concepts/smart-accounts.md

@@ -1,5 +1,6 @@
 ---
 description: Learn about MetaMask Smart Accounts.
+keywords: [MetaMask, smart accounts, account abstraction, ERC-4337]
 ---
 
 # MetaMask Smart Accounts
@@ -43,7 +44,7 @@ See [Create a smart account](../guides/smart-accounts/create-smart-account.md) t
 ### Hybrid smart account
 
 The Hybrid smart account is a flexible implementation that supports both an externally owned account (EOA) owner and any number of passkey (WebAuthn) signers.
-You can configure any of these signers as the signatory, and use them to sign any data, including user operations, on behalf of the smart account.
+You can configure any of these signers, and use them to sign any data, including user operations, on behalf of the smart account.
 
 This type is referenced in the toolkit as `Implementation.Hybrid`.
 
@@ -79,7 +80,7 @@ The MetaMask Smart Accounts flow is as follows:
       tokens or third-party sponsorship.
 
 2. **User operation creation** - For actions such as sending transactions, a user operation is created with
-   necessary details and signed by the configured signatory.
+   necessary details and signed by the configured signers.
 
 3. **Bundlers and mempool** - The signed user operation is submitted to a special mempool, where bundlers
    collect and package multiple user operations into a single transaction to save on gas costs.

delegation-toolkit/experimental/erc-7710-redeem-delegations.md

@@ -65,7 +65,7 @@ This data encodes the authority that lets the delegate redeem the permission.
 ### Security considerations for `accountMeta`
 
 When a user grants a permission, they can provide `accountMeta` which is an array of `factory` and `factoryData` values.
-These calls must be executed before redeeming the permission (this is handled for you in [`sendUserOperationWithDelegation`](../reference/api/experimental-actions/bundler-client.md#senduseroperationwithdelegation)).
+These calls must be executed before redeeming the permission (this is handled for you in [`sendUserOperationWithDelegation`](../reference/erc7715/bundler-client.md#senduseroperationwithdelegation)).
 
 Because each `accountMeta` is an arbitrary call specified by the granter, it is important that these are executed carefully.
 We recommend taking the following precautions:
@@ -86,7 +86,7 @@ Redeem a delegation with a [MetaMask smart account](#redeem-with-a-metamask-smar
 To redeem a delegation with a MetaMask smart account, [create a smart account](../guides/smart-accounts/create-smart-account.md)
 and a [Viem Bundler Client](https://viem.sh/account-abstraction/clients/bundler).
 
-After setting up your Bundler Client, you can extend its functionality with `erc7710BundlerActions` actions to support ERC-7710. Once extended, use [`sendUserOperationWithDelegation`](../reference/api/experimental-actions/bundler-client.md#senduseroperationwithdelegation) to redeem the permission.
+After setting up your Bundler Client, you can extend its functionality with `erc7710BundlerActions` actions to support ERC-7710. Once extended, use [`sendUserOperationWithDelegation`](../reference/erc7715/bundler-client.md#senduseroperationwithdelegation) to redeem the permission.
 
 <Tabs>
 <TabItem value="example.ts">
@@ -146,7 +146,7 @@ export const sessionAccount = await toMetaMaskSmartAccount({
   implementation: Implementation.Hybrid,
   deployParams: [account.address, [], [], []],
   deploySalt: "0x",
-  signatory: { account },
+  signer: { account },
 });
 
 export const bundlerClient = createBundlerClient({
@@ -168,7 +168,7 @@ export const bundlerClient = createBundlerClient({
 
 To redeem a delegation with an EOA, create a [Viem Wallet Client](https://viem.sh/docs/clients/wallet).
 
-After creating your Wallet Client, you can extend its functionality with `erc7710WalletActions` actions to support ERC-7710. Once extended, use [`sendTransactionWithDelegation`](../reference/api/experimental-actions/wallet-client.md#sendtransactionwithdelegation) to redeem the permission.
+After creating your Wallet Client, you can extend its functionality with `erc7710WalletActions` actions to support ERC-7710. Once extended, use [`sendTransactionWithDelegation`](../reference/erc7715/wallet-client.md#sendtransactionwithdelegation) to redeem the permission.
 
 <Tabs>
 <TabItem value="example.ts">

delegation-toolkit/experimental/erc-7715-request-permissions.md

@@ -80,7 +80,7 @@ export const sessionAccount = await toMetaMaskSmartAccount({
   implementation: Implementation.Hybrid,
   deployParams: [account.address, [], [], []],
   deploySalt: "0x",
-  signatory: { account },
+  signer: { account },
 });
 
 export const walletClient = createWalletClient({
@@ -165,7 +165,7 @@ You should always verify the granted permissions and adjust your dapp's behavior
 ## Security considerations for `accountMeta`
 
 When a user grants a permission, they can provide [`accountMeta`](erc-7710-redeem-delegations.md#extract-relevant-data) which is an array of `factory` and `factoryData` values.
-These calls must be executed before redeeming the permission (this is handled for you in [`sendUserOperationWithDelegation`](../reference/api/experimental-actions/bundler-client.md#senduseroperationwithdelegation)).
+These calls must be executed before redeeming the permission (this is handled for you in [`sendUserOperationWithDelegation`](../reference/erc7715/bundler-client.md#senduseroperationwithdelegation)).
 
 Because each `accountMeta` is an arbitrary call specified by the granter, it is important that these are executed carefully.
 We recommend taking the following precautions:

delegation-toolkit/experimental/store-retrieve-delegations.md

@@ -18,7 +18,6 @@ You can use methods provided by the `DelegationStorageClient` of the MetaMask De
 ## Prerequisites
 
 - [Install and set up the Delegation Toolkit.](../get-started/install.md)
-- [Configure the Delegation Toolkit.](../guides/configure.md)
 - Ensure you have an API key and API key ID to interact with the `DelegationStorageClient`.
   If you need to gain access, email [email protected].
 

delegation-toolkit/get-started/erc7715-quickstart.md

@@ -10,12 +10,22 @@ This quickstart demonstrates how to request and redeem ERC-7715 permissions.
 
 ## Prerequisites
 
-- [Install and set up the Delegation Toolkit.](install.md)
-- [Install MetaMask Flask 12.14.2 or later.](/snaps/get-started/install-flask)
+- Install [Node.js](https://nodejs.org/en/blog/release/v18.18.0) v18 or later.
+- Install [Yarn](https://yarnpkg.com/),
+    [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm), or another package manager.
+- [Install MetaMask Flask 12.14.2 or later](/snaps/get-started/install-flask).
 
 ## Steps
 
-### 1. Set up a Wallet Client
+### 1. Install the toolkit
+
+Install the [MetaMask Delegation Toolkit](https://www.npmjs.com/package/@metamask/delegation-toolkit):
+
+```bash npm2yarn
+npm install @metamask/delegation-toolkit
+```
+
+### 2. Set up a Wallet Client
 
 Set up a [Viem Wallet Client](https://viem.sh/docs/clients/wallet) using Viem's `createWalletClient` function. This client will help you interact with MetaMask Flask. 
 
@@ -32,7 +42,7 @@ const walletClient = createWalletClient({
 }).extend(erc7715ProviderActions());
 ```
 
-### 2. Set up a Public Client
+### 3. Set up a Public Client
 
 Set up a [Viem Public Client](https://viem.sh/docs/clients/public) using Viem's `createPublicClient` function. 
 This client will help you query the account state and interact with blockchain networks.
@@ -47,7 +57,7 @@ const publicClient = createPublicClient({
 });
 ```
 
-### 3. Set up a session account
+### 4. Set up a session account
 
 Set up a session account which can either be a smart account or an externally owned 
 account (EOA) to request ERC-7715 permissions. This account is responsible 
@@ -70,11 +80,11 @@ const sessionAccount = await toMetaMaskSmartAccount({
   implementation: Implementation.Hybrid,
   deployParams: [account.address, [], [], []],
   deploySalt: "0x",
-  signatory: { account },
+  signer: { account },
 });
 ```
 
-### 4. Request ERC-7715 permissions
+### 5. Request ERC-7715 permissions
 
 Request ERC-7715 permissions from the user. Currently, only the 
 `native-token-stream` permission type is supported, which allows the dapp to stream 
@@ -106,7 +116,7 @@ const grantedPermissions = await walletClient.grantPermissions([{
 }]);
 ```
 
-### 5. Set up a Bundler Client
+### 6. Set up a Bundler Client
 
 Set up a [Viem Bundler Client](https://viem.sh/account-abstraction/clients/bundler) 
 using Viem's `createBundlerClient` function. This lets you use the bundler service 
@@ -127,7 +137,7 @@ const bundlerClient = createBundlerClient({
 }).extend(erc7710BundlerActions());
 ```
 
-### 6. Redeem ERC-7715 permissions
+### 7. Redeem ERC-7715 permissions
 
 The session account can now [redeem the delegation](../experimental/erc-7710-redeem-delegations.md). The redeem transaction is sent to the `DelegationManager` contract, which validates the delegation and executes actions on the user's behalf.
 

delegation-toolkit/get-started/install.md

@@ -1,6 +1,7 @@
 ---
 sidebar_label: Install and set up
 description: Learn how to install and set up the MetaMask Delegation Toolkit.
+keywords: [install, MetaMask, delegation, toolkit, smart, accounts]
 ---
 
 import Tabs from "@theme/Tabs";
@@ -23,7 +24,7 @@ This page provides instructions to install and set up the MetaMask Delegation To
 
 ### 1. Install the toolkit
 
-Install the [MetaMask Delegation Toolkit](https://github.com/MetaMask/delegation-toolkit) dependencies:
+Install the [MetaMask Delegation Toolkit](https://www.npmjs.com/package/@metamask/delegation-toolkit):
 
 ```bash npm2yarn
 npm install @metamask/delegation-toolkit