Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Apply major ComposableController API updates that fix broken functionality #10441

Draft
wants to merge 68 commits into
base: main
Choose a base branch
from
Draft

fix: Apply major ComposableController API updates that fix broken functionality #10441

wants to merge 68 commits into from
+119 −72

Commits on Sep 12, 2024

  1. Install preview build for @metamask/composable-controller

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    c522e14 View commit details
    Browse the repository at this point in the history

  2. Convert interfaces EngineState, Controllers to use type alias syntax

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    8e0a4a7 View commit details
    Browse the repository at this point in the history

  3. Naive application of new ComposableController API

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    e0d4c33 View commit details
    Browse the repository at this point in the history

  4. Narrow engine datamodel's events allowlist and document required updates

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    4230f50 View commit details
    Browse the repository at this point in the history

  5. Apply @ts-expect-error directive for type error caused by mobile's … 

    …`@metamask/base-controller` being a major version behind `@metamask/composable-controller`
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    0223858 View commit details
    Browse the repository at this point in the history

  6. Add @ts-expect-error directives for stateChange events that need … 

    …to be allowlisted in `ComposableControllerMessenger` but are raising errors pending upstream fixes
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b75a118 View commit details
    Browse the repository at this point in the history

  7. Update Engine API test to include all controllers in engine context

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    90a85df View commit details
    Browse the repository at this point in the history

  8. Update @metamask/composable-controller preview build

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    04f49ce View commit details
    Browse the repository at this point in the history

  9. Remove ts-expect-error directive from `TransactionController:stateC… 

    …hange` due to `@metamask/transaction-controller` version upgrade
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    4e505b3 View commit details
    Browse the repository at this point in the history

  10. Fix type error caused by CurrencyRateController 18.0.0 breaking c… 

    …hange in state type

- This was masked due to `any` typing of `datamodel` field of `Engine` class
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    7d8d12b View commit details
    Browse the repository at this point in the history

  11. Bump @metamask/composable-controller from ^3.0.0 to ^8.0.0

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    942c36d View commit details
    Browse the repository at this point in the history

  12. Remove ts-expect-error directive for base-controller version mismat… 

    …ch error

- Fixed by `@metamask/base-controller` bump to `^6.0.0`
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    eb7f970 View commit details
    Browse the repository at this point in the history

  13. Fix redundant, incomplete entries in Global{Actions,Events} types

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    4c46164 View commit details
    Browse the repository at this point in the history

  14. Remove unused ts-expect-error directive for `TokenBalancesControlle… 

    …r:stateChange`
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    6f91ad5 View commit details
    Browse the repository at this point in the history

  15. Bump @metamask/logging-controller from ^3.0.0 to ^6.0.0

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    23664dd View commit details
    Browse the repository at this point in the history

  16. Add LoggingControllerEvents to GlobalEvents

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    d94b202 View commit details
    Browse the repository at this point in the history

  17. Bump @metamask/base-controller to ^7.0.0, `@metamask/composable-c… 

    …ontroller` to `^9.0.0`
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    69198bd View commit details
    Browse the repository at this point in the history

  18. Add/remove ts-expect-error directives for resolving mismatch betwee… 

    …n base-controller versions
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    c53e8f9 View commit details
    Browse the repository at this point in the history

  19. test: ComposableController updates engine state when it receives a … 

    …`stateChange` event
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    6489509 View commit details
    Browse the repository at this point in the history

  20. Add more granular TODO comments

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b9115c2 View commit details
    Browse the repository at this point in the history

  21. Remove unused stateChange entries for non-controllers in `Composabl… 

    …eController` allowlist
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3eb5305 View commit details
    Browse the repository at this point in the history

  22. test(currency-controller): normalize conversionRate from null to 0

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    c630e1d View commit details
    Browse the repository at this point in the history

  23. Remove unused eslint-disable directive

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    74879b3 View commit details
    Browse the repository at this point in the history

  24. Fix test so its recognized as coverage

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    97cea4c View commit details
    Browse the repository at this point in the history

  25. Fix ts-expect-error errors

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    818eba3 View commit details
    Browse the repository at this point in the history

  26. Revert addition of PPOMController{Actions,Events} to `Global{Action… 

    …s,Events}`
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    1e8d992 View commit details
    Browse the repository at this point in the history

  27. Restore @ts-expect-error directive for PhishingControllerMessenger 

    - To be removed here #11111
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    495f0e6 View commit details
    Browse the repository at this point in the history

  28. Restore @ts-expect-error for base-controller alignment on `Approval… 

    …ControllerMessenger`
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    c6f70c9 View commit details
    Browse the repository at this point in the history

  29. Reorder test expect entries to minimize diff

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2a6d5d0 View commit details
    Browse the repository at this point in the history

  30. Restore PPOMControllerEvents to GlobalEvents

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    59afca8 View commit details
    Browse the repository at this point in the history

  31. Reorganize code to minimize diffs

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2bfb7ac View commit details
    Browse the repository at this point in the history

  32. Remove unnecessary async/await from test

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    a850cf9 View commit details
    Browse the repository at this point in the history

  33. Dedupe yarn lockfile, update Podfile.lock

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    116b85a View commit details
    Browse the repository at this point in the history

  34. Update TODO for removing TransactionControllerOptions subpath import

    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    fa0e6c1 View commit details
    Browse the repository at this point in the history

  35. Add TODO for resolving base-controller mismatch between `AccountsCont… 

    …rollerMessenger` and mobile
    @MajorLift
    MajorLift committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2178825 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    62094e1 View commit details
    Browse the repository at this point in the history

  2. Add comment explaining console errors for failed stateChange subscr… 

    …iptions
    @MajorLift
    MajorLift committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    4970923 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    0f965d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    04958bf View commit details
    Browse the repository at this point in the history

  2. Remove unused ts-expect-error

    @MajorLift
    MajorLift committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    d78d0cc View commit details
    Browse the repository at this point in the history

  3. Revert "Dedupe yarn lockfile, update Podfile.lock" 

    This reverts commit 116b85a.
    @MajorLift
    MajorLift committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    15d633c View commit details
    Browse the repository at this point in the history

  4. Remove unused ts-expect-error

    @MajorLift
    MajorLift committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b9b8ae2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    93add3c View commit details
    Browse the repository at this point in the history

  6. Run git checkout main ios/Podfile.lock

    @MajorLift
    MajorLift committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    390d0e5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    d2fb6e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    d82c4b7 View commit details
    Browse the repository at this point in the history

  2. Add AddressBookController:stateChange to composable controller even… 

    …t allowlist
    @MajorLift
    MajorLift committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e333d8b View commit details
    Browse the repository at this point in the history

  3. Deduplicate lockfile

    @MajorLift
    MajorLift committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    ce96d32 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    c8d030f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    83bc5ca View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    07ee35b View commit details
    Browse the repository at this point in the history

  2. Add notifications controllers actions/events to `Global{Actions,Event… 

    …s}` and `stateChange` events to composable-controller messenger allowlist
    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    83c59ea View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    7833177 View commit details
    Browse the repository at this point in the history

  4. Remove duplicate controller entries in EngineService

    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    78ff64b View commit details
    Browse the repository at this point in the history

  5. Add SnapsRegistry stateChange event to composable controller mess… 

    …enger allowlist
    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    bba0f53 View commit details
    Browse the repository at this point in the history

  6. Add SmartTransactionsController:stateChange to composable controlle… 

    …r messenger allowlist
    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    1896175 View commit details
    Browse the repository at this point in the history

  7. Fix circular typing for this.context in Engine

    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    db5be57 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    7a4fd30 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    305e9f0 View commit details
    Browse the repository at this point in the history

  2. Remove @ts-expect-error directive on `PhishingController:stateChang… 

    …e` entry in composable controller event allowlist
    @MajorLift
    MajorLift committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    0e2a97a View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge remote-tracking branch 'origin/main' into jongsun/fix-composabl… 

    …e-controller
    @cryptodev-2s
    cryptodev-2s committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    42d13d2 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merge remote-tracking branch 'origin/main' into jongsun/fix-composabl… 

    …e-controller
    @cryptodev-2s
    cryptodev-2s committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    fe66a38 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Reflect V2 upgrades for {AccountTracker,Nft,TokenRates}Controller i… 

    …n Global{Actions,Events}, ComposableController event allowlist
    @MajorLift
    MajorLift committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e0ecbcc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into jongsun/fix-composable-controller

    @MajorLift
    MajorLift committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    51e3a5a View commit details
    Browse the repository at this point in the history

  3. Apply changes from PPOMController update

    @MajorLift
    MajorLift committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    e632f70 View commit details
    Browse the repository at this point in the history

  4. Replace BaseState with NonControllerEmptyState

    @MajorLift
    MajorLift committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    24d9936 View commit details
    Browse the repository at this point in the history

  5. Dedupe lockfile

    @MajorLift
    MajorLift committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    c50e9e6 View commit details
    Browse the repository at this point in the history

  6. Update Global{Actions,Events} with `NotificationServicesPushControl… 

    …ler` actions and events
    @MajorLift
    MajorLift committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    eaf1ee2 View commit details
    Browse the repository at this point in the history