Skip to content

feat(money-account-upgrade-controller): persist upgrade status and add retry#9500

Draft
Jwhiles wants to merge 3 commits into
mainfrom
feat/money-account-upgrade-persisted-state-retry
Draft

feat(money-account-upgrade-controller): persist upgrade status and add retry#9500
Jwhiles wants to merge 3 commits into
mainfrom
feat/money-account-upgrade-persisted-state-retry

Conversation

@Jwhiles

@Jwhiles Jwhiles commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Track fully upgraded accounts in persisted controller state, keyed by
lowercased address and fingerprinted against the active upgrade config,
so upgradeAccount skips the step sequence once an account is recorded
as upgraded and re-runs it when the config changes.

Add upgradeAccountWithRetry, retrying failed attempts with capped
exponential backoff (10s/20s/40s/60s, 5 attempts by default) and
AbortSignal cancellation. Failures that cannot resolve by retrying
(account delegated to a third-party EIP-7702 implementation, or
unexpected on-chain code) are marked terminal via TerminalUpgradeError
and are not retried.

Co-Authored-By: Claude Fable 5 noreply@anthropic.com

Explanation

References

Checklist

  • I've updated the test suite for new or updated code as appropriate
  • I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
  • I've communicated my changes to consumers by updating changelogs for packages I've changed
  • I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

@Jwhiles

Jwhiles commented Jul 14, 2026

Copy link
Copy Markdown
Contributor Author

@metamaskbot publish-preview

@Jwhiles Jwhiles force-pushed the feat/money-account-upgrade-persisted-state-retry branch from 10d0bd7 to b22654e Compare July 14, 2026 10:39
@github-actions

Copy link
Copy Markdown
Contributor

Preview builds have been published. Learn how to use preview builds in other projects.

Expand for full list of packages and versions.
@metamask-previews/account-tree-controller@7.5.5-preview-10d0bd75c
@metamask-previews/accounts-controller@39.0.5-preview-10d0bd75c
@metamask-previews/address-book-controller@7.1.2-preview-10d0bd75c
@metamask-previews/ai-controllers@0.8.0-preview-10d0bd75c
@metamask-previews/analytics-controller@1.2.1-preview-10d0bd75c
@metamask-previews/analytics-data-regulation-controller@0.0.0-preview-10d0bd75c
@metamask-previews/announcement-controller@8.1.0-preview-10d0bd75c
@metamask-previews/app-metadata-controller@2.0.1-preview-10d0bd75c
@metamask-previews/approval-controller@9.0.2-preview-10d0bd75c
@metamask-previews/assets-controller@11.0.0-preview-10d0bd75c
@metamask-previews/assets-controllers@109.4.1-preview-10d0bd75c
@metamask-previews/authenticated-user-storage@3.0.1-preview-10d0bd75c
@metamask-previews/base-controller@9.1.0-preview-10d0bd75c
@metamask-previews/base-data-service@0.1.3-preview-10d0bd75c
@metamask-previews/bitcoin-regtest-up@1.0.0-preview-10d0bd75c
@metamask-previews/bridge-controller@77.4.1-preview-10d0bd75c
@metamask-previews/bridge-status-controller@74.1.2-preview-10d0bd75c
@metamask-previews/build-utils@3.0.4-preview-10d0bd75c
@metamask-previews/chain-agnostic-permission@1.7.0-preview-10d0bd75c
@metamask-previews/chomp-api-service@3.1.0-preview-10d0bd75c
@metamask-previews/claims-controller@0.5.3-preview-10d0bd75c
@metamask-previews/client-controller@1.0.1-preview-10d0bd75c
@metamask-previews/client-utils@1.1.0-preview-10d0bd75c
@metamask-previews/compliance-controller@2.1.0-preview-10d0bd75c
@metamask-previews/composable-controller@12.0.1-preview-10d0bd75c
@metamask-previews/config-registry-controller@0.4.1-preview-10d0bd75c
@metamask-previews/connectivity-controller@0.3.0-preview-10d0bd75c
@metamask-previews/controller-utils@12.3.0-preview-10d0bd75c
@metamask-previews/core-backend@6.5.0-preview-10d0bd75c
@metamask-previews/delegation-controller@3.0.2-preview-10d0bd75c
@metamask-previews/earn-controller@12.2.2-preview-10d0bd75c
@metamask-previews/eip-5792-middleware@3.0.5-preview-10d0bd75c
@metamask-previews/eip-7702-internal-rpc-middleware@0.1.1-preview-10d0bd75c
@metamask-previews/eip1193-permission-middleware@2.0.1-preview-10d0bd75c
@metamask-previews/ens-controller@19.1.5-preview-10d0bd75c
@metamask-previews/eth-block-tracker@15.0.1-preview-10d0bd75c
@metamask-previews/eth-json-rpc-middleware@23.1.3-preview-10d0bd75c
@metamask-previews/eth-json-rpc-provider@6.0.1-preview-10d0bd75c
@metamask-previews/foundryup@1.0.1-preview-10d0bd75c
@metamask-previews/gas-fee-controller@26.2.4-preview-10d0bd75c
@metamask-previews/gator-permissions-controller@4.2.3-preview-10d0bd75c
@metamask-previews/geolocation-controller@0.1.3-preview-10d0bd75c
@metamask-previews/java-tron-up@1.0.0-preview-10d0bd75c
@metamask-previews/json-rpc-engine@10.5.0-preview-10d0bd75c
@metamask-previews/json-rpc-middleware-stream@8.0.8-preview-10d0bd75c
@metamask-previews/keyring-controller@27.1.0-preview-10d0bd75c
@metamask-previews/local-node-utils@1.0.0-preview-10d0bd75c
@metamask-previews/logging-controller@8.0.2-preview-10d0bd75c
@metamask-previews/message-manager@14.1.2-preview-10d0bd75c
@metamask-previews/messenger@2.0.0-preview-10d0bd75c
@metamask-previews/messenger-cli@0.2.0-preview-10d0bd75c
@metamask-previews/money-account-api-data-service@0.1.0-preview-10d0bd75c
@metamask-previews/money-account-balance-service@2.2.0-preview-10d0bd75c
@metamask-previews/money-account-controller@0.3.3-preview-10d0bd75c
@metamask-previews/money-account-upgrade-controller@2.2.1-preview-10d0bd75c
@metamask-previews/multichain-account-service@13.0.0-preview-10d0bd75c
@metamask-previews/multichain-api-middleware@4.0.1-preview-10d0bd75c
@metamask-previews/multichain-network-controller@3.2.1-preview-10d0bd75c
@metamask-previews/multichain-transactions-controller@7.1.1-preview-10d0bd75c
@metamask-previews/name-controller@9.1.2-preview-10d0bd75c
@metamask-previews/network-connection-banner-controller@0.1.0-preview-10d0bd75c
@metamask-previews/network-controller@34.0.0-preview-10d0bd75c
@metamask-previews/network-enablement-controller@5.5.0-preview-10d0bd75c
@metamask-previews/notification-services-controller@25.0.0-preview-10d0bd75c
@metamask-previews/passkey-controller@2.0.1-preview-10d0bd75c
@metamask-previews/permission-controller@13.1.1-preview-10d0bd75c
@metamask-previews/permission-log-controller@5.1.0-preview-10d0bd75c
@metamask-previews/perps-controller@9.2.1-preview-10d0bd75c
@metamask-previews/phishing-controller@17.2.1-preview-10d0bd75c
@metamask-previews/platform-api-docs@0.0.0-preview-10d0bd75c
@metamask-previews/polling-controller@16.0.8-preview-10d0bd75c
@metamask-previews/preferences-controller@23.1.0-preview-10d0bd75c
@metamask-previews/profile-metrics-controller@4.0.2-preview-10d0bd75c
@metamask-previews/profile-sync-controller@28.3.0-preview-10d0bd75c
@metamask-previews/ramps-controller@17.0.0-preview-10d0bd75c
@metamask-previews/rate-limit-controller@7.0.1-preview-10d0bd75c
@metamask-previews/react-data-query@0.2.1-preview-10d0bd75c
@metamask-previews/remote-feature-flag-controller@4.2.2-preview-10d0bd75c
@metamask-previews/sample-controllers@5.0.3-preview-10d0bd75c
@metamask-previews/seedless-onboarding-controller@10.0.3-preview-10d0bd75c
@metamask-previews/selected-network-controller@26.1.5-preview-10d0bd75c
@metamask-previews/shield-controller@5.1.3-preview-10d0bd75c
@metamask-previews/signature-controller@39.2.7-preview-10d0bd75c
@metamask-previews/smart-transactions-controller@25.0.1-preview-10d0bd75c
@metamask-previews/snap-account-service@2.0.0-preview-10d0bd75c
@metamask-previews/social-controllers@2.5.0-preview-10d0bd75c
@metamask-previews/solana-test-validator-up@1.0.0-preview-10d0bd75c
@metamask-previews/stellar-quickstart-up@0.0.0-preview-10d0bd75c
@metamask-previews/storage-service@1.0.2-preview-10d0bd75c
@metamask-previews/subscription-controller@6.2.1-preview-10d0bd75c
@metamask-previews/transaction-controller@69.0.0-preview-10d0bd75c
@metamask-previews/transaction-pay-controller@24.0.3-preview-10d0bd75c
@metamask-previews/user-operation-controller@41.2.7-preview-10d0bd75c
@metamask-previews/wallet@7.0.1-preview-10d0bd75c
@metamask-previews/wallet-cli@0.0.0-preview-10d0bd75c

Jwhiles and others added 2 commits July 16, 2026 10:15
…d retry

Track fully upgraded accounts in persisted controller state, keyed by
lowercased address and fingerprinted against the active upgrade config,
so upgradeAccount skips the step sequence once an account is recorded
as upgraded and re-runs it when the config changes.

Add upgradeAccountWithRetry, retrying failed attempts with capped
exponential backoff (10s/20s/40s/60s, 5 attempts by default) and
AbortSignal cancellation. Failures that cannot resolve by retrying
(account delegated to a third-party EIP-7702 implementation, or
unexpected on-chain code) are marked terminal via TerminalUpgradeError
and are not retried.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
… association conflicts as terminal

A 409 from associateAddress whose disambiguating lookup confirms the
address is not associated with the authenticated profile cannot resolve
by retrying, so throw TerminalUpgradeError to stop the retry loop. If
the lookup itself fails, the original retryable conflict still
propagates.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@Jwhiles Jwhiles force-pushed the feat/money-account-upgrade-persisted-state-retry branch from b22654e to 8b1e39b Compare July 16, 2026 09:20
@Jwhiles

Jwhiles commented Jul 16, 2026

Copy link
Copy Markdown
Contributor Author

@metamaskbot publish-preview

@github-actions

Copy link
Copy Markdown
Contributor

Preview builds have been published. Learn how to use preview builds in other projects.

Expand for full list of packages and versions.
@metamask-previews/account-tree-controller@7.5.5-preview-8b1e39b
@metamask-previews/accounts-controller@39.0.5-preview-8b1e39b
@metamask-previews/address-book-controller@7.1.2-preview-8b1e39b
@metamask-previews/ai-controllers@0.8.0-preview-8b1e39b
@metamask-previews/analytics-controller@1.2.1-preview-8b1e39b
@metamask-previews/analytics-data-regulation-controller@0.0.0-preview-8b1e39b
@metamask-previews/announcement-controller@8.1.0-preview-8b1e39b
@metamask-previews/app-metadata-controller@2.0.1-preview-8b1e39b
@metamask-previews/approval-controller@9.0.2-preview-8b1e39b
@metamask-previews/assets-controller@11.0.0-preview-8b1e39b
@metamask-previews/assets-controllers@109.4.1-preview-8b1e39b
@metamask-previews/authenticated-user-storage@3.0.1-preview-8b1e39b
@metamask-previews/base-controller@9.1.0-preview-8b1e39b
@metamask-previews/base-data-service@0.1.3-preview-8b1e39b
@metamask-previews/bitcoin-regtest-up@1.0.0-preview-8b1e39b
@metamask-previews/bridge-controller@77.5.0-preview-8b1e39b
@metamask-previews/bridge-status-controller@74.3.0-preview-8b1e39b
@metamask-previews/build-utils@3.0.4-preview-8b1e39b
@metamask-previews/chain-agnostic-permission@1.7.0-preview-8b1e39b
@metamask-previews/chomp-api-service@3.1.0-preview-8b1e39b
@metamask-previews/claims-controller@0.5.3-preview-8b1e39b
@metamask-previews/client-controller@1.0.1-preview-8b1e39b
@metamask-previews/client-utils@1.1.0-preview-8b1e39b
@metamask-previews/compliance-controller@2.1.0-preview-8b1e39b
@metamask-previews/composable-controller@12.0.1-preview-8b1e39b
@metamask-previews/config-registry-controller@0.4.1-preview-8b1e39b
@metamask-previews/connectivity-controller@0.3.0-preview-8b1e39b
@metamask-previews/controller-utils@12.3.0-preview-8b1e39b
@metamask-previews/core-backend@6.5.0-preview-8b1e39b
@metamask-previews/delegation-controller@3.0.2-preview-8b1e39b
@metamask-previews/earn-controller@12.2.2-preview-8b1e39b
@metamask-previews/eip-5792-middleware@3.0.5-preview-8b1e39b
@metamask-previews/eip-7702-internal-rpc-middleware@0.1.1-preview-8b1e39b
@metamask-previews/eip1193-permission-middleware@2.0.1-preview-8b1e39b
@metamask-previews/ens-controller@19.1.5-preview-8b1e39b
@metamask-previews/eth-block-tracker@15.0.1-preview-8b1e39b
@metamask-previews/eth-json-rpc-middleware@23.1.3-preview-8b1e39b
@metamask-previews/eth-json-rpc-provider@6.0.1-preview-8b1e39b
@metamask-previews/foundryup@1.0.1-preview-8b1e39b
@metamask-previews/gas-fee-controller@26.2.4-preview-8b1e39b
@metamask-previews/gator-permissions-controller@4.2.3-preview-8b1e39b
@metamask-previews/geolocation-controller@0.1.3-preview-8b1e39b
@metamask-previews/java-tron-up@1.0.0-preview-8b1e39b
@metamask-previews/json-rpc-engine@10.5.0-preview-8b1e39b
@metamask-previews/json-rpc-middleware-stream@8.0.8-preview-8b1e39b
@metamask-previews/keyring-controller@27.1.0-preview-8b1e39b
@metamask-previews/local-node-utils@1.0.0-preview-8b1e39b
@metamask-previews/logging-controller@8.0.2-preview-8b1e39b
@metamask-previews/message-manager@14.1.2-preview-8b1e39b
@metamask-previews/messenger@2.0.0-preview-8b1e39b
@metamask-previews/messenger-cli@0.2.0-preview-8b1e39b
@metamask-previews/money-account-api-data-service@0.1.0-preview-8b1e39b
@metamask-previews/money-account-balance-service@2.2.0-preview-8b1e39b
@metamask-previews/money-account-controller@0.3.3-preview-8b1e39b
@metamask-previews/money-account-upgrade-controller@2.2.1-preview-8b1e39b
@metamask-previews/multichain-account-service@13.0.0-preview-8b1e39b
@metamask-previews/multichain-api-middleware@4.0.1-preview-8b1e39b
@metamask-previews/multichain-network-controller@3.2.1-preview-8b1e39b
@metamask-previews/multichain-transactions-controller@7.1.1-preview-8b1e39b
@metamask-previews/name-controller@9.1.2-preview-8b1e39b
@metamask-previews/network-connection-banner-controller@0.1.0-preview-8b1e39b
@metamask-previews/network-controller@34.0.0-preview-8b1e39b
@metamask-previews/network-enablement-controller@5.6.0-preview-8b1e39b
@metamask-previews/notification-services-controller@25.0.0-preview-8b1e39b
@metamask-previews/passkey-controller@2.1.0-preview-8b1e39b
@metamask-previews/permission-controller@13.1.1-preview-8b1e39b
@metamask-previews/permission-log-controller@5.1.0-preview-8b1e39b
@metamask-previews/perps-controller@9.2.1-preview-8b1e39b
@metamask-previews/phishing-controller@17.3.0-preview-8b1e39b
@metamask-previews/platform-api-docs@0.0.0-preview-8b1e39b
@metamask-previews/polling-controller@16.0.8-preview-8b1e39b
@metamask-previews/preferences-controller@23.1.0-preview-8b1e39b
@metamask-previews/profile-metrics-controller@4.0.2-preview-8b1e39b
@metamask-previews/profile-sync-controller@28.3.0-preview-8b1e39b
@metamask-previews/ramps-controller@17.0.0-preview-8b1e39b
@metamask-previews/rate-limit-controller@7.0.1-preview-8b1e39b
@metamask-previews/react-data-query@0.2.2-preview-8b1e39b
@metamask-previews/remote-feature-flag-controller@4.2.2-preview-8b1e39b
@metamask-previews/sample-controllers@5.0.3-preview-8b1e39b
@metamask-previews/seedless-onboarding-controller@10.0.3-preview-8b1e39b
@metamask-previews/selected-network-controller@26.1.5-preview-8b1e39b
@metamask-previews/sentinel-api-service@1.0.0-preview-8b1e39b
@metamask-previews/shield-controller@5.1.3-preview-8b1e39b
@metamask-previews/signature-controller@39.2.7-preview-8b1e39b
@metamask-previews/smart-transactions-controller@25.0.1-preview-8b1e39b
@metamask-previews/snap-account-service@2.0.0-preview-8b1e39b
@metamask-previews/social-controllers@2.5.0-preview-8b1e39b
@metamask-previews/solana-test-validator-up@1.0.0-preview-8b1e39b
@metamask-previews/stellar-quickstart-up@0.0.0-preview-8b1e39b
@metamask-previews/storage-service@1.0.2-preview-8b1e39b
@metamask-previews/subscription-controller@6.2.1-preview-8b1e39b
@metamask-previews/transaction-controller@69.0.0-preview-8b1e39b
@metamask-previews/transaction-pay-controller@25.0.0-preview-8b1e39b
@metamask-previews/user-operation-controller@41.2.7-preview-8b1e39b
@metamask-previews/wallet@7.0.1-preview-8b1e39b
@metamask-previews/wallet-cli@0.0.0-preview-8b1e39b

- Mark the state-shape change as BREAKING in the changelog; the
  release is already major via #9387.
- Exclude upgradedAccounts from state logs (address-keyed enrollment
  data, matching precedent in other address-keyed controllers).
- Validate that maxAttempts is an integer >= 1 so NaN cannot cause
  unbounded retries.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant