chore: fix lint

Author: ByteZhang1024

app/offscreen/onekey.ts

@@ -76,7 +76,7 @@ export default function init() {
           const settings: Partial<ConnectSettings> = {
             debug: true,
             fetchConfig: false,
-            connectSrc: 'https://jssdk.onekey.so/1.1.5/',
+            connectSrc: 'https://jssdk.onekey.so/1.1.17/',
             env: msg.params.env,
           };
 

app/scripts/controller-init/keyring-controller-init.ts

@@ -6,23 +6,23 @@ import { QrKeyring, QrKeyringScannerBridge } from '@metamask/eth-qr-keyring';
 import { KeyringClass } from '@metamask/keyring-utils';
 import LatticeKeyring from 'eth-lattice-keyring';
 import {
-  OneKeyKeyring,
   TrezorConnectBridge,
   TrezorKeyring,
 } from '@metamask/eth-trezor-keyring';
 import {
   LedgerIframeBridge,
   LedgerKeyring,
 } from '@metamask/eth-ledger-bridge-keyring';
+import { OneKeyWebBridge, OneKeyKeyring } from '@metamask/eth-onekey-keyring';
 import { hardwareKeyringBuilderFactory } from '../lib/hardware-keyring-builder-factory';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
 import { qrKeyringBuilderFactory } from '../lib/qr-keyring-builder-factory';
 import { encryptorFactory } from '../lib/encryptor-factory';
 import { TrezorOffscreenBridge } from '../lib/offscreen-bridge/trezor-offscreen-bridge';
 import { LedgerOffscreenBridge } from '../lib/offscreen-bridge/ledger-offscreen-bridge';
-import { OneKeyOffscreenBridge } from './lib/offscreen-bridge/onekey-offscreen-bridge';
+import { OneKeyOffscreenBridge } from '../lib/offscreen-bridge/onekey-offscreen-bridge';
 import { LatticeKeyringOffscreen } from '../lib/offscreen-bridge/lattice-offscreen-keyring';
-import { hardwareOneKeyKeyringBuilderFactory } from './lib/hardware-onekey-keyring-builder-factory';
+import { hardwareOneKeyKeyringBuilderFactory } from '../lib/hardware-onekey-keyring-builder-factory';
 import { ControllerInitFunction } from './types';
 import {
   KeyringControllerMessenger,
@@ -42,6 +42,7 @@ import {
  * bridges.
  * @param request.encryptor - Optional encryptor to use for the controller.
  * @param request.getController - Function to get other controllers.
+ * @param request.platform
  * @returns The initialized controller.
  */
 export const KeyringControllerInit: ControllerInitFunction<
@@ -55,6 +56,7 @@ export const KeyringControllerInit: ControllerInitFunction<
   keyringOverrides,
   encryptor,
   getController,
+  platform,
 }) => {
   const additionalKeyrings = [
     qrKeyringBuilderFactory(
@@ -85,24 +87,25 @@ export const KeyringControllerInit: ControllerInitFunction<
         LedgerKeyring as unknown as KeyringClass,
         keyringOverrides?.ledgerBridge || LedgerIframeBridge,
       ),
+      hardwareKeyringBuilderFactory(
+        OneKeyKeyring as unknown as KeyringClass,
+        keyringOverrides?.oneKey || OneKeyWebBridge,
+      ),
     );
   } else {
     additionalKeyrings.push(
       hardwareKeyringBuilderFactory(
         TrezorKeyring as unknown as KeyringClass,
         keyringOverrides?.trezorBridge || TrezorOffscreenBridge,
       ),
-      hardwareKeyringBuilderFactory(
-        OneKeyKeyring as unknown as KeyringClass,
-        keyringOverrides?.oneKey || TrezorOffscreenBridge,
-      ),
       hardwareKeyringBuilderFactory(
         LedgerKeyring as unknown as KeyringClass,
         keyringOverrides?.ledgerBridge || LedgerOffscreenBridge,
       ),
       hardwareOneKeyKeyringBuilderFactory(
-        OneKeyKeyring,
+        OneKeyKeyring as unknown as KeyringClass,
         keyringOverrides?.oneKey || OneKeyOffscreenBridge,
+        platform,
       ),
       keyringBuilderFactory(LatticeKeyringOffscreen as unknown as KeyringClass),
     );

app/scripts/controller-init/types.ts

@@ -18,6 +18,7 @@ import ExtensionPlatform from '../platforms/extension';
 // This import is only used for the type.
 // eslint-disable-next-line import/no-restricted-paths
 import type { MetaMaskReduxState } from '../../../ui/store/store';
+import { OneKeyOffscreenBridge } from '../lib/offscreen-bridge/onekey-offscreen-bridge';
 import { Controller, ControllerFlatState } from './controller-list';
 
 /** The supported controller names. */
@@ -144,7 +145,7 @@ export type ControllerInitRequest<
     qrBridge?: typeof QrKeyringScannerBridge;
     lattice?: KeyringClass;
     trezorBridge?: HardwareTransportBridgeClass;
-    oneKey?: HardwareTransportBridgeClass;
+    oneKey?: typeof OneKeyOffscreenBridge;
     ledgerBridge?: HardwareTransportBridgeClass;
   };
 

app/scripts/lib/hardware-onekey-keyring-builder-factory.ts

@@ -1,11 +1,8 @@
-import {
-  ONEKEY_HARDWARE_UI_EVENT,
-  type OneKeyBridge,
-} from '@metamask/eth-onekey-keyring';
-import { KeyringClass, Json } from '@metamask/utils';
-import { Platform } from '../../../types/global';
+import { type OneKeyBridge } from '@metamask/eth-onekey-keyring';
+import { KeyringClass } from '@metamask/keyring-utils';
 // eslint-disable-next-line import/no-restricted-paths
 import { HARDWARE_ONEKEY_ERRORS_ROUTE } from '../../../ui/helpers/constants/routes';
+import ExtensionPlatform from '../platforms/extension';
 
 /**
  * A transport bridge between the keyring and the hardware device.
@@ -24,23 +21,24 @@ export type HardwareTransportBridgeClass = new () => OneKeyBridge;
  * @returns A builder function for the given Keyring.
  */
 export function hardwareOneKeyKeyringBuilderFactory(
-  Keyring: KeyringClass<Json>,
+  Keyring: KeyringClass,
   Bridge: HardwareTransportBridgeClass,
-  platform?: Platform,
+  platform?: ExtensionPlatform,
 ) {
   const builder = () => {
-    const keyring = new Keyring({ bridge: new Bridge() });
-    if ('on' in keyring && typeof keyring.on === 'function') {
-      keyring.on(
-        ONEKEY_HARDWARE_UI_EVENT,
-        (payload: { type: string; code: number }) => {
-          platform?.openExtensionInBrowser?.(
-            `${HARDWARE_ONEKEY_ERRORS_ROUTE}/${payload.type ?? payload.code}`,
-          );
-        },
-      );
+    const bridge = new Bridge();
+    if (
+      'setUiEventCallback' in bridge &&
+      typeof bridge.setUiEventCallback === 'function'
+    ) {
+      bridge.setUiEventCallback((payload: { type: string; code: number }) => {
+        platform?.openExtensionInBrowser?.(
+          `${HARDWARE_ONEKEY_ERRORS_ROUTE}/${payload.type ?? payload.code}`,
+        );
+      });
     }
-    return keyring;
+
+    return new Keyring({ bridge });
   };
 
   builder.type = Keyring.type;

app/scripts/lib/offscreen-bridge/onekey-offscreen-bridge.ts

@@ -1,14 +1,12 @@
-import {
-  ONEKEY_HARDWARE_UI_EVENT,
-  OneKeyBridge,
-} from '@metamask/eth-onekey-keyring';
+import { OneKeyBridge } from '@metamask/eth-onekey-keyring';
 import type {
   Params,
   Response as OneKeyResponse,
   EVMSignedTx,
   EVMSignTransactionParams,
   EVMSignMessageParams,
   EVMSignTypedDataParams,
+  Unsuccessful,
 } from '@onekeyfe/hd-core';
 import type { EthereumMessageSignature } from '@onekeyfe/hd-transport';
 import {
@@ -30,17 +28,10 @@ import {
 export class OneKeyOffscreenBridge implements OneKeyBridge {
   model: string | undefined;
 
-  private listeners: Map<string, (payload: unknown) => void> = new Map();
-
-  on(event: string, listener: (payload: unknown) => void) {
-    this.listeners.set(event, listener);
-  }
+  private onUIEvent?: ((event: Unsuccessful['payload']) => void) | undefined;
 
-  off(event: string) {
-    if (!this.listeners.has(event)) {
-      return;
-    }
-    this.listeners.delete(event);
+  setUiEventCallback(callback: (event: Unsuccessful['payload']) => void): void {
+    this.onUIEvent = callback;
   }
 
   init() {
@@ -54,9 +45,8 @@ export class OneKeyOffscreenBridge implements OneKeyBridge {
         msg.target === OffscreenCommunicationTarget.extension &&
         msg.event === OffscreenCommunicationEvents.onekeyDeviceConnectError
       ) {
-        const listener = this.listeners.get(ONEKEY_HARDWARE_UI_EVENT);
-        if (listener) {
-          listener(msg.payload);
+        if (this.onUIEvent) {
+          this.onUIEvent(msg.payload);
         }
       }
     });
@@ -79,6 +69,7 @@ export class OneKeyOffscreenBridge implements OneKeyBridge {
 
   dispose() {
     return new Promise<void>((resolve) => {
+      this.onUIEvent = undefined;
       chrome.runtime.sendMessage(
         {
           target: OffscreenCommunicationTarget.onekeyOffscreen,

app/scripts/metamask-controller.js

@@ -78,7 +78,7 @@ import {
   bytesToHex,
 } from '@metamask/utils';
 import { normalize } from '@metamask/eth-sig-util';
-import { OneKeyKeyring, OneKeyWebBridge } from '@metamask/eth-onekey-keyring';
+import { OneKeyKeyring } from '@metamask/eth-onekey-keyring';
 import { TRIGGER_TYPES } from '@metamask/notification-services-controller/notification-services';
 
 import {