Skip to content
Open
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
108 changes: 0 additions & 108 deletions oxlint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -791,114 +791,6 @@
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/KeyringAccountMonitor.test.ts": {
"typescript/no-unsafe-argument": {
"count": 2
},
"typescript/no-unsafe-call": {
"count": 3
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/KeyringAccountMonitor.ts": {
"typescript/explicit-function-return-type": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/SignatureMonitor.test.ts": {
"typescript/no-explicit-any": {
"count": 1
},
"typescript/no-unsafe-argument": {
"count": 3
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/SignatureMonitor.ts": {
"typescript/no-unnecessary-type-assertion": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionRepository.ts": {
"internal-snaps/no-in-operator": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionService.test.ts": {
"typescript/explicit-function-return-type": {
"count": 6
},
"typescript/no-explicit-any": {
"count": 3
},
"typescript/no-unsafe-argument": {
"count": 3
},
"typescript/no-unsafe-member-access": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionService.ts": {
"internal-snaps/no-in-operator": {
"count": 7
},
"typescript/explicit-function-return-type": {
"count": 1
},
"typescript/no-explicit-any": {
"count": 4
},
"typescript/no-unsafe-argument": {
"count": 2
},
"typescript/no-unsafe-member-access": {
"count": 4
},
"typescript/unbound-method": {
"count": 2
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionRepository.test.ts": {
"typescript/no-explicit-any": {
"count": 1
},
"typescript/no-unsafe-member-access": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionRepository.ts": {
"typescript/explicit-function-return-type": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionService.test.ts": {
"typescript/no-explicit-any": {
"count": 1
},
"typescript/no-unsafe-member-access": {
"count": 1
},
"vitest/no-conditional-in-test": {
"count": 3
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionService.ts": {
"typescript/restrict-template-expressions": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/subscriptions/parseWebSocketMessage.ts": {
"internal-snaps/no-in-operator": {
"count": 1
},
"typescript/no-explicit-any": {
"count": 1
},
"typescript/no-unsafe-assignment": {
"count": 3
},
"typescript/no-unsafe-return": {
"count": 1
}
},
"packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScanService.test.ts": {
"typescript/no-unnecessary-type-assertion": {
"count": 12
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import type { Transaction } from '@metamask/keyring-api';
import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token';
import type { Address } from '@solana/kit';
import { signature } from '@solana/kit';
import type { Mock } from 'vitest';

import type {
AccountNotification,
AccountNotificationHandler,
ConfirmedSubscription,
ProgramNotification,
ProgramNotificationHandler,
SubscribeMethod,
Subscription,
} from '../../../entities';
import { KnownCaip19Id, Network } from '../../constants/solana';
Expand Down Expand Up @@ -107,13 +107,23 @@ describe('KeyringAccountMonitor', () => {
getAll: vi.fn().mockResolvedValue([]),
registerNotificationHandler: vi
.fn()
.mockImplementation(async (method, _network, handler) => {
if (method === 'accountSubscribe') {
accountNotificationHandlers.push(handler);
} else if (method === 'programSubscribe') {
programNotificationHandlers.push(handler);
}
}),
.mockImplementation(
async (
method: SubscribeMethod,
_network: Network,
handler: AccountNotificationHandler | ProgramNotificationHandler,
) => {
if (method === 'accountSubscribe') {
accountNotificationHandlers.push(
handler as AccountNotificationHandler,
);
} else if (method === 'programSubscribe') {
programNotificationHandlers.push(
handler as ProgramNotificationHandler,
);
}
},
),
registerConnectionRecoveryHandler: vi.fn(),
} as unknown as SubscriptionService;

Expand Down Expand Up @@ -719,9 +729,9 @@ describe('KeyringAccountMonitor', () => {
const syncSpy = vi.spyOn(mockAccountsSynchronizer, 'synchronize');

// Simulate connection recovery
const recoveryHandler = (
mockSubscriptionService.registerConnectionRecoveryHandler as Mock
).mock.calls[0]?.[1];
const recoveryHandler = vi.mocked(
mockSubscriptionService.registerConnectionRecoveryHandler,
).mock.calls[0]![1];
await recoveryHandler(Network.Mainnet);

expect(syncSpy).toHaveBeenCalledTimes(1);
Expand All @@ -740,9 +750,9 @@ describe('KeyringAccountMonitor', () => {
const syncSpy = vi.spyOn(mockAccountsSynchronizer, 'synchronize');

// Simulate connection recovery
const recoveryHandler = (
mockSubscriptionService.registerConnectionRecoveryHandler as Mock
).mock.calls[0]?.[1];
const recoveryHandler = vi.mocked(
mockSubscriptionService.registerConnectionRecoveryHandler,
).mock.calls[0]![1];
await recoveryHandler(Network.Mainnet);

expect(syncSpy).toHaveBeenCalledWith(accounts);
Expand All @@ -754,9 +764,9 @@ describe('KeyringAccountMonitor', () => {
const syncSpy = vi.spyOn(mockAccountsSynchronizer, 'synchronize');

// Simulate connection recovery
const recoveryHandler = (
mockSubscriptionService.registerConnectionRecoveryHandler as Mock
).mock.calls[0]?.[1];
const recoveryHandler = vi.mocked(
mockSubscriptionService.registerConnectionRecoveryHandler,
).mock.calls[0]![1];
await recoveryHandler(Network.Mainnet);

expect(syncSpy).not.toHaveBeenCalled();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export class KeyringAccountMonitor {
this.#accountsSynchronizer.synchronize(accounts);

const promises = accounts.flatMap((account) => {
const shouldMonitorOnNetwork = (network: Network) =>
const shouldMonitorOnNetwork = (network: Network): boolean =>
account.scopes.includes(network);

// Monitor native assets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type {
ConnectionRecoveryHandler,
SignatureNotification,
SignatureNotificationHandler,
SubscribeMethod,
Subscription,
} from '../../../entities';
import { Network } from '../../constants/solana';
Expand Down Expand Up @@ -58,16 +59,24 @@ describe('SignatureMonitor', () => {
unsubscribe: vi.fn(),
registerNotificationHandler: vi
.fn()
.mockImplementation(async (_method, _network, handler) => {
// This will let us capture and manually call the handler
notificationHandlers.push(handler);
}),
.mockImplementation(
async (
_method: SubscribeMethod,
_network: Network,
handler: SignatureNotificationHandler,
) => {
// This will let us capture and manually call the handler
notificationHandlers.push(handler);
},
),
registerConnectionRecoveryHandler: vi
.fn()
.mockImplementation(async (_network, handler) => {
// This will let us capture and manually call the handler
connectionRecoveryHandlers.push(handler);
}),
.mockImplementation(
async (_network: Network, handler: ConnectionRecoveryHandler) => {
// This will let us capture and manually call the handler
connectionRecoveryHandlers.push(handler);
},
),
} as unknown as SubscriptionService;

mockAccountService = {
Expand Down Expand Up @@ -395,7 +404,7 @@ describe('SignatureMonitor', () => {
value: [{ confirmationStatus: 'processed' }],
}),
}),
} as any);
} as unknown as ReturnType<SolanaConnection['getRpc']>);

await signatureMonitor.monitor(
signature,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ export class SignatureMonitor {
accountType: account.type,
chainIdCaip: transaction.chain,
transactionStatus: transaction.status,
transactionType:
transactionType ??
(transaction.type as TransactionType | undefined),
transactionType: transactionType ?? transaction.type,
});
break;
default:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { IStateManager } from '@metamask/snap-networks-utils';
import { hasProperty } from '@metamask/utils';

import type {
ConfirmedSubscription,
Expand Down Expand Up @@ -69,7 +70,7 @@ export class SubscriptionRepository {

return subscriptions.find(
(subscription) =>
key in subscription &&
hasProperty(subscription, key) &&
subscription[key as keyof Subscription] === value,
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ const createMockConfirmationMessage = (

const createMockUnsubscriptionConfirmationMessage = (
id: string = globalThis.crypto.randomUUID(),
) => ({
): WebSocketMessage => ({
type: 'message',
id,
origin: 'some-origin',
data: {
type: 'text',
message: JSON.stringify({ jsonrpc: '2.0', id, result: true }),
Expand All @@ -57,8 +58,8 @@ const createMockUnsubscriptionConfirmationMessage = (
const createMockNotificationMessage = (
id: string = globalThis.crypto.randomUUID(),
rpcSubscriptionId = 98765,
result: any = {},
) => ({
result: unknown = {},
): WebSocketMessage => ({
type: 'message',
id,
origin: 'some-origin',
Expand All @@ -73,11 +74,12 @@ const createMockNotificationMessage = (
});

const createMockFailureMessage = (
error: any,
error: unknown,
id: string = globalThis.crypto.randomUUID(),
) => ({
): WebSocketMessage => ({
type: 'message',
id,
origin: 'some-origin',
data: {
type: 'text',
message: JSON.stringify({
Expand All @@ -91,7 +93,7 @@ const createMockFailureMessage = (
const simulateDisconnection = async (
eventEmitter: EventEmitter,
connectionId: string,
) => {
): Promise<void> => {
await eventEmitter.emitSync('onWebSocketEvent', {
event: {
type: 'close',
Expand All @@ -103,7 +105,7 @@ const simulateDisconnection = async (
const simulateReconnection = async (
eventEmitter: EventEmitter,
connectionId: string,
) => {
): Promise<void> => {
await eventEmitter.emitSync('onWebSocketEvent', {
event: {
type: 'open',
Expand All @@ -115,7 +117,7 @@ const simulateReconnection = async (
const triggerConnectionRecoveryHandlers = async (
connectionRecoveryHandlers: Map<Network, ConnectionRecoveryHandler[]>,
network: Network,
) => {
): Promise<void> => {
const recoveryHandlers = connectionRecoveryHandlers.get(network) ?? [];
await Promise.all(
recoveryHandlers.map(async (handler) => {
Expand Down Expand Up @@ -149,19 +151,23 @@ describe('SubscriptionService', () => {
const snap = {
request: vi.fn(),
};
(globalThis as any).snap = snap;
(globalThis as unknown as { snap: typeof snap }).snap = snap;

mockWebSocketConnectionService = {
openConnection: vi.fn(),
findById: vi.fn().mockReturnValue(mockConnection),
findByNetwork: vi.fn().mockReturnValue(mockConnection),
// Allows to capture the connection recovery handlers to trigger them manually
onConnectionRecovery: vi.fn().mockImplementation((network, handler) => {
connectionRecoveryHandlers.set(network, [
...(connectionRecoveryHandlers.get(network) ?? []),
handler,
]);
}),
onConnectionRecovery: vi
.fn()
.mockImplementation(
(network: Network, handler: ConnectionRecoveryHandler) => {
connectionRecoveryHandlers.set(network, [
...(connectionRecoveryHandlers.get(network) ?? []),
handler,
]);
},
),
handleConnectionEvent: vi.fn(),
} as unknown as WebSocketConnectionService;

Expand Down
Loading
Loading