@metamask/money-account-upgrade-controller 1.1.0 → 1.3.0

package/CHANGELOG.md

@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.0]
+
+### Changed
+
+- Bump `@metamask/chomp-api-service` from `^2.0.0` to `^3.0.0` ([#8651](https://github.com/MetaMask/core/pull/8651))
+- Bump `@metamask/messenger` from `^1.1.1` to `^1.2.0` ([#8632](https://github.com/MetaMask/core/pull/8632))
+- Bump `@metamask/keyring-controller` from `^25.2.0` to `^25.3.0` ([#8634](https://github.com/MetaMask/core/pull/8634))
+- Bump `@metamask/network-controller` from `^30.0.1` to `^30.1.0` ([#8636](https://github.com/MetaMask/core/pull/8636))
+
+### Fixed
+
+- Fix the associate-address step to detect the already-associated case via `status: 'active'`. ([#8635](https://github.com/MetaMask/core/pull/8635))
+
+## [1.2.0]
+
+### Changed
+
+- Bump `@metamask/chomp-api-service` from `^1.0.0` to `^2.0.0` ([#8618](https://github.com/MetaMask/core/pull/8618))
+
+### Fixed
+
+- Send the CHOMP authentication timestamp as a number instead of a string in the associate-address step. ([#8610](https://github.com/MetaMask/core/pull/8610))
+
 ## [1.1.0]
 
 ### Added
@@ -19,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add `MoneyAccountUpgradeController` with `upgradeAccount` method ([#8426](https://github.com/MetaMask/core/pull/8426))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/money-account-upgrade-controller@1.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/money-account-upgrade-controller@1.3.0...HEAD
+[1.3.0]: https://github.com/MetaMask/core/compare/@metamask/money-account-upgrade-controller@1.2.0...@metamask/money-account-upgrade-controller@1.3.0
+[1.2.0]: https://github.com/MetaMask/core/compare/@metamask/money-account-upgrade-controller@1.1.0...@metamask/money-account-upgrade-controller@1.2.0
 [1.1.0]: https://github.com/MetaMask/core/compare/@metamask/money-account-upgrade-controller@1.0.0...@metamask/money-account-upgrade-controller@1.1.0
 [1.0.0]: https://github.com/MetaMask/core/releases/tag/@metamask/money-account-upgrade-controller@1.0.0

package/dist/steps/associate-address.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.associateAddressStep = void 0;
-const ALREADY_ASSOCIATED_STATUS = 'already_associated';
 /**
  * Associates the Money Account address with the user's CHOMP profile.
  *
@@ -9,15 +8,16 @@ const ALREADY_ASSOCIATED_STATUS = 'already_associated';
  * and submits the signature to CHOMP, which verifies the timestamp is fresh,
  * recovers the signer, and records the profile–address mapping.
  *
- * CHOMP responds with 201 and `status: 'created'` when the association is
- * made, and 409 with `status: 'already_associated'` when the address is
- * already linked to a profile. The service surfaces both responses, so this
- * step reports `'already-done'` for the 409 case and `'completed'` otherwise.
+ * CHOMP responds with 201 and `status: 'created'` when a new association is
+ * made, and 409 with `status: 'active'` when the address is already
+ * associated with the authenticated profile. The service surfaces both
+ * responses, so this step reports `'already-done'` for the 409 case and
+ * `'completed'` otherwise.
  */
 exports.associateAddressStep = {
     name: 'associate-address',
     async run({ messenger, address }) {
-        const timestamp = Date.now().toString();
+        const timestamp = Date.now();
         const message = `CHOMP Authentication ${timestamp}`;
         const signature = (await messenger.call('KeyringController:signPersonalMessage', { data: message, from: address }));
         const response = await messenger.call('ChompApiService:associateAddress', {
@@ -25,7 +25,7 @@ exports.associateAddressStep = {
             timestamp,
             address,
         });
-        if (response.status === ALREADY_ASSOCIATED_STATUS) {
+        if (response.status === 'active') {
             return 'already-done';
         }
         return 'completed';

package/dist/steps/associate-address.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"associate-address.cjs","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":";;;AAIA,MAAM,yBAAyB,GAAG,oBAAoB,CAAC;AAEvD;;;;;;;;;;;GAWG;AACU,QAAA,oBAAoB,GAAS;IACxC,IAAI,EAAE,mBAAmB;IACzB,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,wBAAwB,SAAS,EAAE,CAAC;QAEpD,MAAM,SAAS,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CACrC,uCAAuC,EACvC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CACjC,CAAQ,CAAC;QAEV,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,kCAAkC,EAAE;YACxE,SAAS;YACT,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAyB,EAAE,CAAC;YAClD,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { Step } from './step';\n\nconst ALREADY_ASSOCIATED_STATUS = 'already_associated';\n\n/**\n * Associates the Money Account address with the user's CHOMP profile.\n *\n * Signs `CHOMP Authentication {timestamp}` (EIP-191) with the account's key\n * and submits the signature to CHOMP, which verifies the timestamp is fresh,\n * recovers the signer, and records the profile–address mapping.\n *\n * CHOMP responds with 201 and `status: 'created'` when the association is\n * made, and 409 with `status: 'already_associated'` when the address is\n * already linked to a profile. The service surfaces both responses, so this\n * step reports `'already-done'` for the 409 case and `'completed'` otherwise.\n */\nexport const associateAddressStep: Step = {\n  name: 'associate-address',\n  async run({ messenger, address }) {\n    const timestamp = Date.now().toString();\n    const message = `CHOMP Authentication ${timestamp}`;\n\n    const signature = (await messenger.call(\n      'KeyringController:signPersonalMessage',\n      { data: message, from: address },\n    )) as Hex;\n\n    const response = await messenger.call('ChompApiService:associateAddress', {\n      signature,\n      timestamp,\n      address,\n    });\n\n    if (response.status === ALREADY_ASSOCIATED_STATUS) {\n      return 'already-done';\n    }\n\n    return 'completed';\n  },\n};\n"]}
+{"version":3,"file":"associate-address.cjs","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":";;;AAIA;;;;;;;;;;;;GAYG;AACU,QAAA,oBAAoB,GAAS;IACxC,IAAI,EAAE,mBAAmB;IACzB,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,wBAAwB,SAAS,EAAE,CAAC;QAEpD,MAAM,SAAS,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CACrC,uCAAuC,EACvC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CACjC,CAAQ,CAAC;QAEV,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,kCAAkC,EAAE;YACxE,SAAS;YACT,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { Step } from './step';\n\n/**\n * Associates the Money Account address with the user's CHOMP profile.\n *\n * Signs `CHOMP Authentication {timestamp}` (EIP-191) with the account's key\n * and submits the signature to CHOMP, which verifies the timestamp is fresh,\n * recovers the signer, and records the profile–address mapping.\n *\n * CHOMP responds with 201 and `status: 'created'` when a new association is\n * made, and 409 with `status: 'active'` when the address is already\n * associated with the authenticated profile. The service surfaces both\n * responses, so this step reports `'already-done'` for the 409 case and\n * `'completed'` otherwise.\n */\nexport const associateAddressStep: Step = {\n  name: 'associate-address',\n  async run({ messenger, address }) {\n    const timestamp = Date.now();\n    const message = `CHOMP Authentication ${timestamp}`;\n\n    const signature = (await messenger.call(\n      'KeyringController:signPersonalMessage',\n      { data: message, from: address },\n    )) as Hex;\n\n    const response = await messenger.call('ChompApiService:associateAddress', {\n      signature,\n      timestamp,\n      address,\n    });\n\n    if (response.status === 'active') {\n      return 'already-done';\n    }\n\n    return 'completed';\n  },\n};\n"]}

package/dist/steps/associate-address.d.cts

@@ -6,10 +6,11 @@ import type { Step } from "./step.cjs";
  * and submits the signature to CHOMP, which verifies the timestamp is fresh,
  * recovers the signer, and records the profile–address mapping.
  *
- * CHOMP responds with 201 and `status: 'created'` when the association is
- * made, and 409 with `status: 'already_associated'` when the address is
- * already linked to a profile. The service surfaces both responses, so this
- * step reports `'already-done'` for the 409 case and `'completed'` otherwise.
+ * CHOMP responds with 201 and `status: 'created'` when a new association is
+ * made, and 409 with `status: 'active'` when the address is already
+ * associated with the authenticated profile. The service surfaces both
+ * responses, so this step reports `'already-done'` for the 409 case and
+ * `'completed'` otherwise.
  */
 export declare const associateAddressStep: Step;
 //# sourceMappingURL=associate-address.d.cts.map

package/dist/steps/associate-address.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"associate-address.d.cts","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,mBAAe;AAInC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,EAAE,IAuBlC,CAAC"}
+{"version":3,"file":"associate-address.d.cts","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,mBAAe;AAEnC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,oBAAoB,EAAE,IAuBlC,CAAC"}

package/dist/steps/associate-address.d.mts

@@ -6,10 +6,11 @@ import type { Step } from "./step.mjs";
  * and submits the signature to CHOMP, which verifies the timestamp is fresh,
  * recovers the signer, and records the profile–address mapping.
  *
- * CHOMP responds with 201 and `status: 'created'` when the association is
- * made, and 409 with `status: 'already_associated'` when the address is
- * already linked to a profile. The service surfaces both responses, so this
- * step reports `'already-done'` for the 409 case and `'completed'` otherwise.
+ * CHOMP responds with 201 and `status: 'created'` when a new association is
+ * made, and 409 with `status: 'active'` when the address is already
+ * associated with the authenticated profile. The service surfaces both
+ * responses, so this step reports `'already-done'` for the 409 case and
+ * `'completed'` otherwise.
  */
 export declare const associateAddressStep: Step;
 //# sourceMappingURL=associate-address.d.mts.map

package/dist/steps/associate-address.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"associate-address.d.mts","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,mBAAe;AAInC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,EAAE,IAuBlC,CAAC"}
+{"version":3,"file":"associate-address.d.mts","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,mBAAe;AAEnC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,oBAAoB,EAAE,IAuBlC,CAAC"}

package/dist/steps/associate-address.mjs

@@ -1,4 +1,3 @@
-const ALREADY_ASSOCIATED_STATUS = 'already_associated';
 /**
  * Associates the Money Account address with the user's CHOMP profile.
  *
@@ -6,15 +5,16 @@ const ALREADY_ASSOCIATED_STATUS = 'already_associated';
  * and submits the signature to CHOMP, which verifies the timestamp is fresh,
  * recovers the signer, and records the profile–address mapping.
  *
- * CHOMP responds with 201 and `status: 'created'` when the association is
- * made, and 409 with `status: 'already_associated'` when the address is
- * already linked to a profile. The service surfaces both responses, so this
- * step reports `'already-done'` for the 409 case and `'completed'` otherwise.
+ * CHOMP responds with 201 and `status: 'created'` when a new association is
+ * made, and 409 with `status: 'active'` when the address is already
+ * associated with the authenticated profile. The service surfaces both
+ * responses, so this step reports `'already-done'` for the 409 case and
+ * `'completed'` otherwise.
  */
 export const associateAddressStep = {
     name: 'associate-address',
     async run({ messenger, address }) {
-        const timestamp = Date.now().toString();
+        const timestamp = Date.now();
         const message = `CHOMP Authentication ${timestamp}`;
         const signature = (await messenger.call('KeyringController:signPersonalMessage', { data: message, from: address }));
         const response = await messenger.call('ChompApiService:associateAddress', {
@@ -22,7 +22,7 @@ export const associateAddressStep = {
             timestamp,
             address,
         });
-        if (response.status === ALREADY_ASSOCIATED_STATUS) {
+        if (response.status === 'active') {
             return 'already-done';
         }
         return 'completed';

package/dist/steps/associate-address.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"associate-address.mjs","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":"AAIA,MAAM,yBAAyB,GAAG,oBAAoB,CAAC;AAEvD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAS;IACxC,IAAI,EAAE,mBAAmB;IACzB,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,wBAAwB,SAAS,EAAE,CAAC;QAEpD,MAAM,SAAS,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CACrC,uCAAuC,EACvC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CACjC,CAAQ,CAAC;QAEV,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,kCAAkC,EAAE;YACxE,SAAS;YACT,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,yBAAyB,EAAE,CAAC;YAClD,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { Step } from './step';\n\nconst ALREADY_ASSOCIATED_STATUS = 'already_associated';\n\n/**\n * Associates the Money Account address with the user's CHOMP profile.\n *\n * Signs `CHOMP Authentication {timestamp}` (EIP-191) with the account's key\n * and submits the signature to CHOMP, which verifies the timestamp is fresh,\n * recovers the signer, and records the profile–address mapping.\n *\n * CHOMP responds with 201 and `status: 'created'` when the association is\n * made, and 409 with `status: 'already_associated'` when the address is\n * already linked to a profile. The service surfaces both responses, so this\n * step reports `'already-done'` for the 409 case and `'completed'` otherwise.\n */\nexport const associateAddressStep: Step = {\n  name: 'associate-address',\n  async run({ messenger, address }) {\n    const timestamp = Date.now().toString();\n    const message = `CHOMP Authentication ${timestamp}`;\n\n    const signature = (await messenger.call(\n      'KeyringController:signPersonalMessage',\n      { data: message, from: address },\n    )) as Hex;\n\n    const response = await messenger.call('ChompApiService:associateAddress', {\n      signature,\n      timestamp,\n      address,\n    });\n\n    if (response.status === ALREADY_ASSOCIATED_STATUS) {\n      return 'already-done';\n    }\n\n    return 'completed';\n  },\n};\n"]}
+{"version":3,"file":"associate-address.mjs","sourceRoot":"","sources":["../../src/steps/associate-address.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAS;IACxC,IAAI,EAAE,mBAAmB;IACzB,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,wBAAwB,SAAS,EAAE,CAAC;QAEpD,MAAM,SAAS,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CACrC,uCAAuC,EACvC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CACjC,CAAQ,CAAC;QAEV,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,kCAAkC,EAAE;YACxE,SAAS;YACT,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nimport type { Step } from './step';\n\n/**\n * Associates the Money Account address with the user's CHOMP profile.\n *\n * Signs `CHOMP Authentication {timestamp}` (EIP-191) with the account's key\n * and submits the signature to CHOMP, which verifies the timestamp is fresh,\n * recovers the signer, and records the profile–address mapping.\n *\n * CHOMP responds with 201 and `status: 'created'` when a new association is\n * made, and 409 with `status: 'active'` when the address is already\n * associated with the authenticated profile. The service surfaces both\n * responses, so this step reports `'already-done'` for the 409 case and\n * `'completed'` otherwise.\n */\nexport const associateAddressStep: Step = {\n  name: 'associate-address',\n  async run({ messenger, address }) {\n    const timestamp = Date.now();\n    const message = `CHOMP Authentication ${timestamp}`;\n\n    const signature = (await messenger.call(\n      'KeyringController:signPersonalMessage',\n      { data: message, from: address },\n    )) as Hex;\n\n    const response = await messenger.call('ChompApiService:associateAddress', {\n      signature,\n      timestamp,\n      address,\n    });\n\n    if (response.status === 'active') {\n      return 'already-done';\n    }\n\n    return 'completed';\n  },\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/money-account-upgrade-controller",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "MetaMask Money account upgrade controller",
   "keywords": [
     "Ethereum",
@@ -54,10 +54,10 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^9.1.0",
-    "@metamask/chomp-api-service": "^1.0.0",
-    "@metamask/keyring-controller": "^25.2.0",
-    "@metamask/messenger": "^1.1.1",
-    "@metamask/network-controller": "^30.0.1",
+    "@metamask/chomp-api-service": "^3.0.0",
+    "@metamask/keyring-controller": "^25.3.0",
+    "@metamask/messenger": "^1.2.0",
+    "@metamask/network-controller": "^30.1.0",
     "@metamask/utils": "^11.9.0"
   },
   "devDependencies": {