@metamask/money-account-upgrade-controller 1.3.1 → 2.0.0

package/dist/steps/register-intents.mjs

@@ -0,0 +1,66 @@
+import { equalsIgnoreCase, makeHasVedaRedeemerCaveat } from "./delegation-matchers.mjs";
+/**
+ * Parses a delegation's metadata `type` field — typed as `string` in storage —
+ * into the narrow set of CHOMP intent types. Throws if the field carries any
+ * other value, since registering it as an intent would be a category error.
+ *
+ * @param type - The `type` field from `DelegationMetadata`.
+ * @returns The same value, narrowed to `IntentMetadataType`.
+ */
+function parseIntentMetadataType(type) {
+    if (type !== 'cash-deposit' && type !== 'cash-withdrawal') {
+        throw new Error(`Expected delegation type to be "cash-deposit" or "cash-withdrawal", got "${type}"`);
+    }
+    return type;
+}
+/**
+ * Registers CHOMP intents for the auto-deposit / auto-withdrawal delegations
+ * persisted by the build-delegation step.
+ *
+ * For each stored delegation between this account and CHOMP's delegate on
+ * this chain, the step builds an intent referencing the stored
+ * `delegationHash` and submits the batch to `POST /v1/intent`. Delegations
+ * whose `delegationHash` already has an active intent on CHOMP are skipped
+ * (revoked intents are re-registered). Reports `'already-done'` when every
+ * eligible delegation already has an active intent.
+ *
+ * Once registered, CHOMP re-fetches the delegation from Authenticated User
+ * Storage, re-validates it, and adds the account to its monitoring list so
+ * subsequent eligible operations can be picked up automatically.
+ */
+export const registerIntentsStep = {
+    name: 'register-intents',
+    async run({ messenger, address, chainId, delegateAddress, redeemerEnforcer, vedaVaultAdapterAddress, }) {
+        const [delegations, existingIntents] = await Promise.all([
+            messenger.call('AuthenticatedUserStorageService:listDelegations'),
+            messenger.call('ChompApiService:getIntentsByAddress', address),
+        ]);
+        const activeIntentHashes = new Set(existingIntents
+            .filter((intent) => intent.status === 'active')
+            .map((intent) => intent.delegationHash.toLowerCase()));
+        const hasVedaRedeemerCaveat = makeHasVedaRedeemerCaveat(redeemerEnforcer, vedaVaultAdapterAddress);
+        const needsIntent = (entry) => equalsIgnoreCase(entry.signedDelegation.delegator, address) &&
+            equalsIgnoreCase(entry.signedDelegation.delegate, delegateAddress) &&
+            equalsIgnoreCase(entry.metadata.chainIdHex, chainId) &&
+            hasVedaRedeemerCaveat(entry) &&
+            !activeIntentHashes.has(entry.metadata.delegationHash.toLowerCase());
+        const toIntent = (entry) => ({
+            account: address,
+            delegationHash: entry.metadata.delegationHash,
+            chainId,
+            metadata: {
+                allowance: entry.metadata.allowance,
+                tokenSymbol: entry.metadata.tokenSymbol,
+                tokenAddress: entry.metadata.tokenAddress,
+                type: parseIntentMetadataType(entry.metadata.type),
+            },
+        });
+        const intents = delegations.filter(needsIntent).map(toIntent);
+        if (intents.length === 0) {
+            return 'already-done';
+        }
+        await messenger.call('ChompApiService:createIntents', intents);
+        return 'completed';
+    },
+};
+//# sourceMappingURL=register-intents.mjs.map

package/dist/steps/register-intents.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-intents.mjs","sourceRoot":"","sources":["../../src/steps/register-intents.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EAC1B,kCAA8B;AAK/B;;;;;;;GAOG;AACH,SAAS,uBAAuB,CAAC,IAAY;IAC3C,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACb,4EAA4E,IAAI,GAAG,CACpF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAS;IACvC,IAAI,EAAE,kBAAkB;IACxB,KAAK,CAAC,GAAG,CAAC,EACR,SAAS,EACT,OAAO,EACP,OAAO,EACP,eAAe,EACf,gBAAgB,EAChB,uBAAuB,GACxB;QACC,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvD,SAAS,CAAC,IAAI,CAAC,iDAAiD,CAAC;YACjE,SAAS,CAAC,IAAI,CAAC,qCAAqC,EAAE,OAAO,CAAC;SAC/D,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,eAAe;aACZ,MAAM,CAAC,CAAC,MAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC;aAC3D,GAAG,CAAC,CAAC,MAAmB,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CACrE,CAAC;QAEF,MAAM,qBAAqB,GAAG,yBAAyB,CACrD,gBAAgB,EAChB,uBAAuB,CACxB,CAAC;QAEF,MAAM,WAAW,GAAG,CAAC,KAAyB,EAAW,EAAE,CACzD,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC;YAC3D,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,eAAe,CAAC;YAClE,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;YACpD,qBAAqB,CAAC,KAAK,CAAC;YAC5B,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;QAEvE,MAAM,QAAQ,GAAG,CAAC,KAAyB,EAAoB,EAAE,CAAC,CAAC;YACjE,OAAO,EAAE,OAAO;YAChB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,cAAc;YAC7C,OAAO;YACP,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;gBACnC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;gBACvC,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC,YAAY;gBACzC,IAAI,EAAE,uBAAuB,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;aACnD;SACF,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE9D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,MAAM,SAAS,CAAC,IAAI,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAC/D,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["import type { DelegationResponse } from '@metamask/authenticated-user-storage';\nimport type {\n  IntentEntry,\n  SendIntentParams,\n} from '@metamask/chomp-api-service';\n\nimport {\n  equalsIgnoreCase,\n  makeHasVedaRedeemerCaveat,\n} from './delegation-matchers';\nimport type { Step } from './step';\n\ntype IntentMetadataType = SendIntentParams['metadata']['type'];\n\n/**\n * Parses a delegation's metadata `type` field — typed as `string` in storage —\n * into the narrow set of CHOMP intent types. Throws if the field carries any\n * other value, since registering it as an intent would be a category error.\n *\n * @param type - The `type` field from `DelegationMetadata`.\n * @returns The same value, narrowed to `IntentMetadataType`.\n */\nfunction parseIntentMetadataType(type: string): IntentMetadataType {\n  if (type !== 'cash-deposit' && type !== 'cash-withdrawal') {\n    throw new Error(\n      `Expected delegation type to be \"cash-deposit\" or \"cash-withdrawal\", got \"${type}\"`,\n    );\n  }\n  return type;\n}\n\n/**\n * Registers CHOMP intents for the auto-deposit / auto-withdrawal delegations\n * persisted by the build-delegation step.\n *\n * For each stored delegation between this account and CHOMP's delegate on\n * this chain, the step builds an intent referencing the stored\n * `delegationHash` and submits the batch to `POST /v1/intent`. Delegations\n * whose `delegationHash` already has an active intent on CHOMP are skipped\n * (revoked intents are re-registered). Reports `'already-done'` when every\n * eligible delegation already has an active intent.\n *\n * Once registered, CHOMP re-fetches the delegation from Authenticated User\n * Storage, re-validates it, and adds the account to its monitoring list so\n * subsequent eligible operations can be picked up automatically.\n */\nexport const registerIntentsStep: Step = {\n  name: 'register-intents',\n  async run({\n    messenger,\n    address,\n    chainId,\n    delegateAddress,\n    redeemerEnforcer,\n    vedaVaultAdapterAddress,\n  }) {\n    const [delegations, existingIntents] = await Promise.all([\n      messenger.call('AuthenticatedUserStorageService:listDelegations'),\n      messenger.call('ChompApiService:getIntentsByAddress', address),\n    ]);\n\n    const activeIntentHashes = new Set(\n      existingIntents\n        .filter((intent: IntentEntry) => intent.status === 'active')\n        .map((intent: IntentEntry) => intent.delegationHash.toLowerCase()),\n    );\n\n    const hasVedaRedeemerCaveat = makeHasVedaRedeemerCaveat(\n      redeemerEnforcer,\n      vedaVaultAdapterAddress,\n    );\n\n    const needsIntent = (entry: DelegationResponse): boolean =>\n      equalsIgnoreCase(entry.signedDelegation.delegator, address) &&\n      equalsIgnoreCase(entry.signedDelegation.delegate, delegateAddress) &&\n      equalsIgnoreCase(entry.metadata.chainIdHex, chainId) &&\n      hasVedaRedeemerCaveat(entry) &&\n      !activeIntentHashes.has(entry.metadata.delegationHash.toLowerCase());\n\n    const toIntent = (entry: DelegationResponse): SendIntentParams => ({\n      account: address,\n      delegationHash: entry.metadata.delegationHash,\n      chainId,\n      metadata: {\n        allowance: entry.metadata.allowance,\n        tokenSymbol: entry.metadata.tokenSymbol,\n        tokenAddress: entry.metadata.tokenAddress,\n        type: parseIntentMetadataType(entry.metadata.type),\n      },\n    });\n\n    const intents = delegations.filter(needsIntent).map(toIntent);\n\n    if (intents.length === 0) {\n      return 'already-done';\n    }\n\n    await messenger.call('ChompApiService:createIntents', intents);\n    return 'completed';\n  },\n};\n"]}

package/dist/steps/step.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"step.cjs","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { MoneyAccountUpgradeControllerMessenger } from '../MoneyAccountUpgradeController';\n\n/**\n * Context supplied to each step when it is run.\n */\nexport type StepContext = {\n  messenger: MoneyAccountUpgradeControllerMessenger;\n  address: Hex;\n  chainId: Hex;\n  delegatorImplAddress: Hex;\n};\n\n/**\n * The outcome of running a single step in the Money Account upgrade sequence.\n *\n * - `'already-done'` — the step's remote check determined that no work was\n *   required; no action was taken.\n * - `'completed'` — the step performed its action and is now done.\n */\nexport type StepResult = 'already-done' | 'completed';\n\n/**\n * A single step in the Money Account upgrade sequence.\n *\n * Each step is responsible for checking whether its action has already been\n * applied (returning `'already-done'` if so) and otherwise performing the\n * action and returning `'completed'`.\n */\nexport type Step = {\n  name: string;\n  run: (context: StepContext) => Promise<StepResult>;\n};\n"]}
+{"version":3,"file":"step.cjs","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { MoneyAccountUpgradeControllerMessenger } from '../MoneyAccountUpgradeController';\n\n/**\n * Context supplied to each step when it is run.\n */\nexport type StepContext = {\n  messenger: MoneyAccountUpgradeControllerMessenger;\n  address: Hex;\n  chainId: Hex;\n  boringVaultAddress: Hex;\n  delegateAddress: Hex;\n  delegatorImplAddress: Hex;\n  erc20TransferAmountEnforcer: Hex;\n  musdTokenAddress: Hex;\n  redeemerEnforcer: Hex;\n  valueLteEnforcer: Hex;\n  vedaVaultAdapterAddress: Hex;\n};\n\n/**\n * The outcome of running a single step in the Money Account upgrade sequence.\n *\n * - `'already-done'` — the step's remote check determined that no work was\n *   required; no action was taken.\n * - `'completed'` — the step performed its action and is now done.\n */\nexport type StepResult = 'already-done' | 'completed';\n\n/**\n * A single step in the Money Account upgrade sequence.\n *\n * Each step is responsible for checking whether its action has already been\n * applied (returning `'already-done'` if so) and otherwise performing the\n * action and returning `'completed'`.\n */\nexport type Step = {\n  name: string;\n  run: (context: StepContext) => Promise<StepResult>;\n};\n"]}

package/dist/steps/step.d.cts

@@ -7,7 +7,14 @@ export type StepContext = {
     messenger: MoneyAccountUpgradeControllerMessenger;
     address: Hex;
     chainId: Hex;
+    boringVaultAddress: Hex;
+    delegateAddress: Hex;
     delegatorImplAddress: Hex;
+    erc20TransferAmountEnforcer: Hex;
+    musdTokenAddress: Hex;
+    redeemerEnforcer: Hex;
+    valueLteEnforcer: Hex;
+    vedaVaultAdapterAddress: Hex;
 };
 /**
  * The outcome of running a single step in the Money Account upgrade sequence.

package/dist/steps/step.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"step.d.cts","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,OAAO,KAAK,EAAE,sCAAsC,EAAE,6CAAyC;AAE/F;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,sCAAsC,CAAC;IAClD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,oBAAoB,EAAE,GAAG,CAAC;CAC3B,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,WAAW,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD,CAAC"}
+{"version":3,"file":"step.d.cts","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,OAAO,KAAK,EAAE,sCAAsC,EAAE,6CAAyC;AAE/F;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,sCAAsC,CAAC;IAClD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,GAAG,CAAC;IACrB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,2BAA2B,EAAE,GAAG,CAAC;IACjC,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,uBAAuB,EAAE,GAAG,CAAC;CAC9B,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,WAAW,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD,CAAC"}

package/dist/steps/step.d.mts

@@ -7,7 +7,14 @@ export type StepContext = {
     messenger: MoneyAccountUpgradeControllerMessenger;
     address: Hex;
     chainId: Hex;
+    boringVaultAddress: Hex;
+    delegateAddress: Hex;
     delegatorImplAddress: Hex;
+    erc20TransferAmountEnforcer: Hex;
+    musdTokenAddress: Hex;
+    redeemerEnforcer: Hex;
+    valueLteEnforcer: Hex;
+    vedaVaultAdapterAddress: Hex;
 };
 /**
  * The outcome of running a single step in the Money Account upgrade sequence.

package/dist/steps/step.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"step.d.mts","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,OAAO,KAAK,EAAE,sCAAsC,EAAE,6CAAyC;AAE/F;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,sCAAsC,CAAC;IAClD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,oBAAoB,EAAE,GAAG,CAAC;CAC3B,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,WAAW,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD,CAAC"}
+{"version":3,"file":"step.d.mts","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,OAAO,KAAK,EAAE,sCAAsC,EAAE,6CAAyC;AAE/F;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,EAAE,sCAAsC,CAAC;IAClD,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,GAAG,CAAC;IACrB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,2BAA2B,EAAE,GAAG,CAAC;IACjC,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,uBAAuB,EAAE,GAAG,CAAC;CAC9B,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,WAAW,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD,CAAC"}

package/dist/steps/step.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"step.mjs","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { MoneyAccountUpgradeControllerMessenger } from '../MoneyAccountUpgradeController';\n\n/**\n * Context supplied to each step when it is run.\n */\nexport type StepContext = {\n  messenger: MoneyAccountUpgradeControllerMessenger;\n  address: Hex;\n  chainId: Hex;\n  delegatorImplAddress: Hex;\n};\n\n/**\n * The outcome of running a single step in the Money Account upgrade sequence.\n *\n * - `'already-done'` — the step's remote check determined that no work was\n *   required; no action was taken.\n * - `'completed'` — the step performed its action and is now done.\n */\nexport type StepResult = 'already-done' | 'completed';\n\n/**\n * A single step in the Money Account upgrade sequence.\n *\n * Each step is responsible for checking whether its action has already been\n * applied (returning `'already-done'` if so) and otherwise performing the\n * action and returning `'completed'`.\n */\nexport type Step = {\n  name: string;\n  run: (context: StepContext) => Promise<StepResult>;\n};\n"]}
+{"version":3,"file":"step.mjs","sourceRoot":"","sources":["../../src/steps/step.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { MoneyAccountUpgradeControllerMessenger } from '../MoneyAccountUpgradeController';\n\n/**\n * Context supplied to each step when it is run.\n */\nexport type StepContext = {\n  messenger: MoneyAccountUpgradeControllerMessenger;\n  address: Hex;\n  chainId: Hex;\n  boringVaultAddress: Hex;\n  delegateAddress: Hex;\n  delegatorImplAddress: Hex;\n  erc20TransferAmountEnforcer: Hex;\n  musdTokenAddress: Hex;\n  redeemerEnforcer: Hex;\n  valueLteEnforcer: Hex;\n  vedaVaultAdapterAddress: Hex;\n};\n\n/**\n * The outcome of running a single step in the Money Account upgrade sequence.\n *\n * - `'already-done'` — the step's remote check determined that no work was\n *   required; no action was taken.\n * - `'completed'` — the step performed its action and is now done.\n */\nexport type StepResult = 'already-done' | 'completed';\n\n/**\n * A single step in the Money Account upgrade sequence.\n *\n * Each step is responsible for checking whether its action has already been\n * applied (returning `'already-done'` if so) and otherwise performing the\n * action and returning `'completed'`.\n */\nexport type Step = {\n  name: string;\n  run: (context: StepContext) => Promise<StepResult>;\n};\n"]}

package/dist/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\n/**\n * Contract addresses and configuration required to perform the\n * Money Account upgrade sequence.\n */\nexport type UpgradeConfig = {\n  /** CHOMP's delegate address — receives the delegation. */\n  delegateAddress: Hex;\n  /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */\n  delegatorImplAddress: Hex;\n  /** The mUSD token contract address. */\n  musdTokenAddress: Hex;\n  /** The Veda vault adapter contract address. */\n  vedaVaultAdapterAddress: Hex;\n  /** Address of the ERC20TransferAmountEnforcer caveat enforcer. */\n  erc20TransferAmountEnforcer: Hex;\n  /** Address of the RedeemerEnforcer caveat enforcer. */\n  redeemerEnforcer: Hex;\n  /** Address of the ValueLteEnforcer caveat enforcer. */\n  valueLteEnforcer: Hex;\n};\n\n/**\n * Configuration values passed to {@link MoneyAccountUpgradeController.init}\n * that cannot be derived from the service details API.\n */\nexport type InitConfig = Pick<\n  UpgradeConfig,\n  | 'delegatorImplAddress'\n  | 'musdTokenAddress'\n  | 'redeemerEnforcer'\n  | 'valueLteEnforcer'\n>;\n"]}
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\n/**\n * Configuration required to perform the Money Account upgrade sequence.\n *\n * `delegateAddress`, `musdTokenAddress`, and `vedaVaultAdapterAddress` come\n * from the CHOMP service details API. `delegatorImplAddress` and the caveat\n * enforcer addresses are resolved from `@metamask/delegation-deployments` for\n * the target chain. (DelegationManager resolution is delegated to\n * `@metamask/delegation-controller`, which handles delegation signing.)\n */\nexport type UpgradeConfig = {\n  /** CHOMP's delegate address — receives the delegation. */\n  delegateAddress: Hex;\n  /** The mUSD token contract address (deposit-side delegation token). */\n  musdTokenAddress: Hex;\n  /** The Veda boring vault contract address (withdrawal-side delegation token, vmUSD). */\n  boringVaultAddress: Hex;\n  /** The Veda vault adapter contract address. */\n  vedaVaultAdapterAddress: Hex;\n  /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */\n  delegatorImplAddress: Hex;\n  /** Address of the ERC20TransferAmountEnforcer caveat enforcer. */\n  erc20TransferAmountEnforcer: Hex;\n  /** Address of the RedeemerEnforcer caveat enforcer. */\n  redeemerEnforcer: Hex;\n  /** Address of the ValueLteEnforcer caveat enforcer. */\n  valueLteEnforcer: Hex;\n};\n"]}

package/dist/types.d.cts

@@ -1,17 +1,24 @@
 import type { Hex } from "@metamask/utils";
 /**
- * Contract addresses and configuration required to perform the
- * Money Account upgrade sequence.
+ * Configuration required to perform the Money Account upgrade sequence.
+ *
+ * `delegateAddress`, `musdTokenAddress`, and `vedaVaultAdapterAddress` come
+ * from the CHOMP service details API. `delegatorImplAddress` and the caveat
+ * enforcer addresses are resolved from `@metamask/delegation-deployments` for
+ * the target chain. (DelegationManager resolution is delegated to
+ * `@metamask/delegation-controller`, which handles delegation signing.)
  */
 export type UpgradeConfig = {
     /** CHOMP's delegate address — receives the delegation. */
     delegateAddress: Hex;
-    /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */
-    delegatorImplAddress: Hex;
-    /** The mUSD token contract address. */
+    /** The mUSD token contract address (deposit-side delegation token). */
     musdTokenAddress: Hex;
+    /** The Veda boring vault contract address (withdrawal-side delegation token, vmUSD). */
+    boringVaultAddress: Hex;
     /** The Veda vault adapter contract address. */
     vedaVaultAdapterAddress: Hex;
+    /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */
+    delegatorImplAddress: Hex;
     /** Address of the ERC20TransferAmountEnforcer caveat enforcer. */
     erc20TransferAmountEnforcer: Hex;
     /** Address of the RedeemerEnforcer caveat enforcer. */
@@ -19,9 +26,4 @@ export type UpgradeConfig = {
     /** Address of the ValueLteEnforcer caveat enforcer. */
     valueLteEnforcer: Hex;
 };
-/**
- * Configuration values passed to {@link MoneyAccountUpgradeController.init}
- * that cannot be derived from the service details API.
- */
-export type InitConfig = Pick<UpgradeConfig, 'delegatorImplAddress' | 'musdTokenAddress' | 'redeemerEnforcer' | 'valueLteEnforcer'>;
 //# sourceMappingURL=types.d.cts.map

package/dist/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,0DAA0D;IAC1D,eAAe,EAAE,GAAG,CAAC;IACrB,sEAAsE;IACtE,oBAAoB,EAAE,GAAG,CAAC;IAC1B,uCAAuC;IACvC,gBAAgB,EAAE,GAAG,CAAC;IACtB,+CAA+C;IAC/C,uBAAuB,EAAE,GAAG,CAAC;IAC7B,kEAAkE;IAClE,2BAA2B,EAAE,GAAG,CAAC;IACjC,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;IACtB,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAC3B,aAAa,EACX,sBAAsB,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,CACrB,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C;;;;;;;;GAQG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,0DAA0D;IAC1D,eAAe,EAAE,GAAG,CAAC;IACrB,uEAAuE;IACvE,gBAAgB,EAAE,GAAG,CAAC;IACtB,wFAAwF;IACxF,kBAAkB,EAAE,GAAG,CAAC;IACxB,+CAA+C;IAC/C,uBAAuB,EAAE,GAAG,CAAC;IAC7B,sEAAsE;IACtE,oBAAoB,EAAE,GAAG,CAAC;IAC1B,kEAAkE;IAClE,2BAA2B,EAAE,GAAG,CAAC;IACjC,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;IACtB,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;CACvB,CAAC"}

package/dist/types.d.mts

@@ -1,17 +1,24 @@
 import type { Hex } from "@metamask/utils";
 /**
- * Contract addresses and configuration required to perform the
- * Money Account upgrade sequence.
+ * Configuration required to perform the Money Account upgrade sequence.
+ *
+ * `delegateAddress`, `musdTokenAddress`, and `vedaVaultAdapterAddress` come
+ * from the CHOMP service details API. `delegatorImplAddress` and the caveat
+ * enforcer addresses are resolved from `@metamask/delegation-deployments` for
+ * the target chain. (DelegationManager resolution is delegated to
+ * `@metamask/delegation-controller`, which handles delegation signing.)
  */
 export type UpgradeConfig = {
     /** CHOMP's delegate address — receives the delegation. */
     delegateAddress: Hex;
-    /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */
-    delegatorImplAddress: Hex;
-    /** The mUSD token contract address. */
+    /** The mUSD token contract address (deposit-side delegation token). */
     musdTokenAddress: Hex;
+    /** The Veda boring vault contract address (withdrawal-side delegation token, vmUSD). */
+    boringVaultAddress: Hex;
     /** The Veda vault adapter contract address. */
     vedaVaultAdapterAddress: Hex;
+    /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */
+    delegatorImplAddress: Hex;
     /** Address of the ERC20TransferAmountEnforcer caveat enforcer. */
     erc20TransferAmountEnforcer: Hex;
     /** Address of the RedeemerEnforcer caveat enforcer. */
@@ -19,9 +26,4 @@ export type UpgradeConfig = {
     /** Address of the ValueLteEnforcer caveat enforcer. */
     valueLteEnforcer: Hex;
 };
-/**
- * Configuration values passed to {@link MoneyAccountUpgradeController.init}
- * that cannot be derived from the service details API.
- */
-export type InitConfig = Pick<UpgradeConfig, 'delegatorImplAddress' | 'musdTokenAddress' | 'redeemerEnforcer' | 'valueLteEnforcer'>;
 //# sourceMappingURL=types.d.mts.map

package/dist/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,0DAA0D;IAC1D,eAAe,EAAE,GAAG,CAAC;IACrB,sEAAsE;IACtE,oBAAoB,EAAE,GAAG,CAAC;IAC1B,uCAAuC;IACvC,gBAAgB,EAAE,GAAG,CAAC;IACtB,+CAA+C;IAC/C,uBAAuB,EAAE,GAAG,CAAC;IAC7B,kEAAkE;IAClE,2BAA2B,EAAE,GAAG,CAAC;IACjC,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;IACtB,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAC3B,aAAa,EACX,sBAAsB,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,CACrB,CAAC"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C;;;;;;;;GAQG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,0DAA0D;IAC1D,eAAe,EAAE,GAAG,CAAC;IACrB,uEAAuE;IACvE,gBAAgB,EAAE,GAAG,CAAC;IACtB,wFAAwF;IACxF,kBAAkB,EAAE,GAAG,CAAC;IACxB,+CAA+C;IAC/C,uBAAuB,EAAE,GAAG,CAAC;IAC7B,sEAAsE;IACtE,oBAAoB,EAAE,GAAG,CAAC;IAC1B,kEAAkE;IAClE,2BAA2B,EAAE,GAAG,CAAC;IACjC,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;IACtB,uDAAuD;IACvD,gBAAgB,EAAE,GAAG,CAAC;CACvB,CAAC"}

package/dist/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\n/**\n * Contract addresses and configuration required to perform the\n * Money Account upgrade sequence.\n */\nexport type UpgradeConfig = {\n  /** CHOMP's delegate address — receives the delegation. */\n  delegateAddress: Hex;\n  /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */\n  delegatorImplAddress: Hex;\n  /** The mUSD token contract address. */\n  musdTokenAddress: Hex;\n  /** The Veda vault adapter contract address. */\n  vedaVaultAdapterAddress: Hex;\n  /** Address of the ERC20TransferAmountEnforcer caveat enforcer. */\n  erc20TransferAmountEnforcer: Hex;\n  /** Address of the RedeemerEnforcer caveat enforcer. */\n  redeemerEnforcer: Hex;\n  /** Address of the ValueLteEnforcer caveat enforcer. */\n  valueLteEnforcer: Hex;\n};\n\n/**\n * Configuration values passed to {@link MoneyAccountUpgradeController.init}\n * that cannot be derived from the service details API.\n */\nexport type InitConfig = Pick<\n  UpgradeConfig,\n  | 'delegatorImplAddress'\n  | 'musdTokenAddress'\n  | 'redeemerEnforcer'\n  | 'valueLteEnforcer'\n>;\n"]}
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\n/**\n * Configuration required to perform the Money Account upgrade sequence.\n *\n * `delegateAddress`, `musdTokenAddress`, and `vedaVaultAdapterAddress` come\n * from the CHOMP service details API. `delegatorImplAddress` and the caveat\n * enforcer addresses are resolved from `@metamask/delegation-deployments` for\n * the target chain. (DelegationManager resolution is delegated to\n * `@metamask/delegation-controller`, which handles delegation signing.)\n */\nexport type UpgradeConfig = {\n  /** CHOMP's delegate address — receives the delegation. */\n  delegateAddress: Hex;\n  /** The mUSD token contract address (deposit-side delegation token). */\n  musdTokenAddress: Hex;\n  /** The Veda boring vault contract address (withdrawal-side delegation token, vmUSD). */\n  boringVaultAddress: Hex;\n  /** The Veda vault adapter contract address. */\n  vedaVaultAdapterAddress: Hex;\n  /** The EIP-7702 delegation target (EIP7702StatelessDeleGatorImpl). */\n  delegatorImplAddress: Hex;\n  /** Address of the ERC20TransferAmountEnforcer caveat enforcer. */\n  erc20TransferAmountEnforcer: Hex;\n  /** Address of the RedeemerEnforcer caveat enforcer. */\n  redeemerEnforcer: Hex;\n  /** Address of the ValueLteEnforcer caveat enforcer. */\n  valueLteEnforcer: Hex;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/money-account-upgrade-controller",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "description": "MetaMask Money account upgrade controller",
   "keywords": [
     "Ethereum",
@@ -53,11 +53,15 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
+    "@metamask/authenticated-user-storage": "^1.0.1",
     "@metamask/base-controller": "^9.1.0",
-    "@metamask/chomp-api-service": "^3.0.0",
-    "@metamask/keyring-controller": "^25.4.0",
+    "@metamask/chomp-api-service": "^3.1.0",
+    "@metamask/delegation-controller": "^3.0.0",
+    "@metamask/delegation-core": "^2.0.0",
+    "@metamask/delegation-deployments": "^1.3.0",
+    "@metamask/keyring-controller": "^25.5.0",
     "@metamask/messenger": "^1.2.0",
-    "@metamask/network-controller": "^30.1.0",
+    "@metamask/network-controller": "^31.1.0",
     "@metamask/utils": "^11.9.0"
   },
   "devDependencies": {
@@ -66,6 +70,7 @@
     "@types/jest": "^29.5.14",
     "deepmerge": "^4.2.2",
     "jest": "^29.7.0",
+    "jest-environment-node": "^29.7.0",
     "ts-jest": "^29.2.5",
     "tsx": "^4.20.5",
     "typedoc": "^0.25.13",