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.

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

fix: Add migration to fix NotificationServicesController bug #12219

Merged
merged 13 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions app/store/migrations/060.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import migrate, { DEFAULT_NOTIFICATION_SERVICES_CONTROLLER } from './060';
import { merge } from 'lodash';
import { captureException } from '@sentry/react-native';
import initialRootState, { backgroundState } from '../../util/test/initial-root-state';
import mockedEngine from '../../core/__mocks__/MockedEngine';

jest.mock('@sentry/react-native', () => ({
captureException: jest.fn(),
}));
const mockedCaptureException = jest.mocked(captureException);

jest.mock('../../core/Engine', () => ({
init: () => mockedEngine.init(),
}));

describe('Migration #60 - Insert NotificationServicesController if missing', () => {
beforeEach(() => {
jest.restoreAllMocks();
jest.resetAllMocks();
});

const invalidStates = [
{
state: null,
errorMessage: "FATAL ERROR: Migration 60: Invalid state error: 'object'",
scenario: 'state is invalid',
},
{
state: merge({}, initialRootState, {
engine: null,
}),
errorMessage:
"FATAL ERROR: Migration 60: Invalid engine state error: 'object'",
scenario: 'engine state is invalid',
},
{
state: merge({}, initialRootState, {
engine: {
backgroundState: null,
},
}),
errorMessage:
"FATAL ERROR: Migration 60: Invalid engine backgroundState error: 'object'",
scenario: 'backgroundState is invalid',
},
];

for (const { errorMessage, scenario, state } of invalidStates) {
it(`should capture exception if ${scenario}`, async () => {
const newState = await migrate(state);

expect(newState).toStrictEqual(state);
expect(mockedCaptureException).toHaveBeenCalledWith(expect.any(Error));
expect(mockedCaptureException.mock.calls[0][0].message).toBe(
errorMessage,
);
});
}

it('should insert default NotificationServicesController if missing', async () => {
const oldState = {
...initialRootState,
engine: {
backgroundState,
},
};

const expectedState = {
...initialRootState,
engine: {
backgroundState: {
...backgroundState,
NotificationServicesController: DEFAULT_NOTIFICATION_SERVICES_CONTROLLER
},
},
};

const migratedState = await migrate(oldState);
expect(migratedState).toStrictEqual(expectedState);
});
});
29 changes: 29 additions & 0 deletions app/store/migrations/060.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { ensureValidState } from './util';
import { hasProperty, isObject } from '@metamask/utils';

export const DEFAULT_NOTIFICATION_SERVICES_CONTROLLER = {
isCheckingAccountsPresence: false,
isFeatureAnnouncementsEnabled: false,
isFetchingMetamaskNotifications: false,
isMetamaskNotificationsFeatureSeen: false,
isNotificationServicesEnabled: false,
isUpdatingMetamaskNotifications: false,
isUpdatingMetamaskNotificationsAccount: [],
metamaskNotificationsList: [],
metamaskNotificationsReadList: [],
subscriptionAccountsSeen: [],
};

export default function migrate(state: unknown) {
if (!ensureValidState(state, 60)) {
return state;
}

if (
!hasProperty(state.engine.backgroundState, 'NotificationServicesController') ||
!isObject(state.engine.backgroundState.NotificationServicesController)
) {
state.engine.backgroundState.NotificationServicesController = DEFAULT_NOTIFICATION_SERVICES_CONTROLLER;
}
return state;
}
2 changes: 2 additions & 0 deletions app/store/migrations/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import migration56 from './056';
import migration57 from './057';
import migration58 from './058';
import migration59 from './059';
import migration60 from './060';

type MigrationFunction = (state: unknown) => unknown;
type AsyncMigrationFunction = (state: unknown) => Promise<unknown>;
Expand Down Expand Up @@ -132,6 +133,7 @@ export const migrationList: MigrationsList = {
57: migration57,
58: migration58,
59: migration59,
60: migration60
};

// Enable both synchronous and asynchronous migrations
Expand Down
6 changes: 6 additions & 0 deletions app/util/sentry/tags/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ import { selectPendingApprovals } from '../../../selectors/approvalController';

export function getTraceTags(state: RootState) {
if (!Object.keys(state?.engine?.backgroundState).length) return;
if (!state?.engine?.backgroundState?.AccountsController) return;
if (!state?.engine?.backgroundState?.NftController) return;
if (!state?.engine?.backgroundState?.NotificationServicesController) return;
if (!state?.engine?.backgroundState?.TokensController) return;
if (!state?.engine?.backgroundState?.TransactionController) return;
if (!state?.engine?.backgroundState?.NotificationServicesController) return;
const unlocked = state.user.userLoggedIn;
const accountCount = selectInternalAccounts(state).length;
const nftCount = selectAllNftsFlat(state).length;
Expand Down
Loading