chore: replace the onekey keyring

Author: ByteZhang1024

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

@@ -4,7 +4,7 @@ import type {
   LedgerBridgeOptions,
 } from '@metamask/eth-ledger-bridge-keyring';
 import { KeyringClass } from '@metamask/keyring-utils';
-import type { OneKeyBridge } from 'eth-onekey-bridge-keyring';
+import type { OneKeyBridge } from '@metamask/eth-onekey-keyring';
 import { FakeKeyringBridge } from '../../../test/stub/keyring-bridge';
 
 /**

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

@@ -1,7 +1,7 @@
 import {
   ONEKEY_HARDWARE_UI_EVENT,
   type OneKeyBridge,
-} from 'eth-onekey-bridge-keyring';
+} from '@metamask/eth-onekey-keyring';
 import { KeyringClass, Json } from '@metamask/utils';
 import { Platform } from '../../../types/global';
 // eslint-disable-next-line import/no-restricted-paths

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

@@ -1,9 +1,8 @@
 import {
   ONEKEY_HARDWARE_UI_EVENT,
   OneKeyBridge,
-} from 'eth-onekey-bridge-keyring';
+} from '@metamask/eth-onekey-keyring';
 import type {
-  ConnectSettings,
   Params,
   Response as OneKeyResponse,
   EVMSignedTx,
@@ -44,7 +43,7 @@ export class OneKeyOffscreenBridge implements OneKeyBridge {
     this.listeners.delete(event);
   }
 
-  init(settings: Partial<ConnectSettings>) {
+  init() {
     chrome.runtime.onMessage.addListener((msg) => {
       if (
         msg.target === OffscreenCommunicationTarget.extension &&
@@ -68,7 +67,6 @@ export class OneKeyOffscreenBridge implements OneKeyBridge {
           target: OffscreenCommunicationTarget.onekeyOffscreen,
           action: OneKeyAction.init,
           params: {
-            ...settings,
             env: window.navigator.usb ? 'webusb' : 'web',
           },
         },

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 'eth-onekey-bridge-keyring';
+import { OneKeyKeyring, OneKeyWebBridge } from '@metamask/eth-onekey-keyring';
 import { TRIGGER_TYPES } from '@metamask/notification-services-controller/notification-services';
 
 import {

package.json

@@ -299,6 +299,7 @@
     "@metamask/eth-json-rpc-filters": "^9.0.0",
     "@metamask/eth-json-rpc-middleware": "^21.0.0",
     "@metamask/eth-ledger-bridge-keyring": "11.1.2",
+    "@metamask/eth-onekey-keyring": "npm:@metamask-previews/[email protected]",
     "@metamask/eth-qr-keyring": "^1.1.0",
     "@metamask/eth-sig-util": "^8.2.0",
     "@metamask/eth-snap-keyring": "^18.0.2",
@@ -408,7 +409,6 @@
     "eth-ens-namehash": "^2.0.8",
     "eth-lattice-keyring": "patch:eth-lattice-keyring@npm%3A0.12.4#~/.yarn/patches/eth-lattice-keyring-npm-0.12.4-c5fb3fcf54.patch",
     "eth-method-registry": "^4.0.0",
-    "eth-onekey-bridge-keyring": "^0.3.8",
     "ethereumjs-util": "^7.0.10",
     "extension-port-stream": "^5.0.0",
     "fast-json-patch": "^3.1.1",
@@ -795,7 +795,7 @@
       "@trezor/connect-web>@trezor/connect>@trezor/blockchain-link>@solana/web3.js>bigint-buffer": false,
       "@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>blake-hash": false,
       "@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>tiny-secp256k1": false,
-      "eth-onekey-bridge-keyring>@onekeyfe/hd-transport>protobufjs": false,
+      "@metamask/eth-onekey-keyring>@onekeyfe/hd-transport>protobufjs": false,
       "@storybook/test-runner>@swc/core": false,
       "@lavamoat/lavadome-react>@lavamoat/preinstall-always-fail": false,
       "sharp": true,

yarn.lock

@@ -2394,7 +2394,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@endo/promise-kit@npm:^1.1.10, @endo/promise-kit@npm:^1.1.13":
+"@endo/promise-kit@npm:^1.1.10":
+  version: 1.1.10
+  resolution: "@endo/promise-kit@npm:1.1.10"
+  dependencies:
+    ses: "npm:^1.12.0"
+  checksum: 10/c73fba3d26ef7133d2d9ea5f14a8ff9b65ce7f8edab0462d22120ef57de99f9aacdcdfdf469793cf5d5ce699ed526d039e9717a294e8c2db7778b142886d93fd
+  languageName: node
+  linkType: hard
+
+"@endo/promise-kit@npm:^1.1.13":
   version: 1.1.13
   resolution: "@endo/promise-kit@npm:1.1.13"
   dependencies:
@@ -6491,6 +6500,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-onekey-keyring@npm:@metamask-previews/[email protected]":
+  version: 0.1.0-7d43e97
+  resolution: "@metamask-previews/eth-onekey-keyring@npm:0.1.0-7d43e97"
+  dependencies:
+    "@ethereumjs/tx": "npm:^5.4.0"
+    "@ethereumjs/util": "npm:^9.1.0"
+    "@metamask/eth-sig-util": "npm:^8.2.0"
+    "@metamask/utils": "npm:^11.1.0"
+    "@noble/hashes": "npm:^1.7.0"
+    "@onekeyfe/hd-core": "npm:1.1.6-patch.4"
+    "@onekeyfe/hd-shared": "npm:1.1.6-patch.4"
+    "@onekeyfe/hd-transport": "npm:1.1.6-patch.4"
+    "@onekeyfe/hd-web-sdk": "npm:1.1.6-patch.4"
+    hdkey: "npm:^2.1.0"
+  checksum: 10/3c036cfe2307d96b583f398cfbe92f0ef9c32520ebb49e609faa14c9159802e41f01d5549d54c16971bbfaca9fdb4a762cbecede4dfda5276a1f49e904aa3ff5
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-qr-keyring@npm:^1.1.0":
   version: 1.1.0
   resolution: "@metamask/eth-qr-keyring@npm:1.1.0"
@@ -25268,23 +25295,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eth-onekey-bridge-keyring@npm:^0.3.8":
-  version: 0.3.8
-  resolution: "eth-onekey-bridge-keyring@npm:0.3.8"
-  dependencies:
-    "@ethereumjs/tx": "npm:^5.4.0"
-    "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/eth-sig-util": "npm:^8.2.0"
-    "@noble/hashes": "npm:^1.7.0"
-    "@onekeyfe/hd-core": "npm:1.1.6-patch.4"
-    "@onekeyfe/hd-shared": "npm:1.1.6-patch.4"
-    "@onekeyfe/hd-transport": "npm:1.1.6-patch.4"
-    "@onekeyfe/hd-web-sdk": "npm:1.1.6-patch.4"
-    hdkey: "npm:^2.1.0"
-  checksum: 10/3c99e4ff38c6d3d5b4a2656d12ee2e3b5a31a5a9d504ed7f27e76aff5ba074d4815f65119722036282cb4dd3a4e62bf8dba0b0622f2aade536b715e393370ce2
-  languageName: node
-  linkType: hard
-
 "eth-phishing-detect@npm:^1.2.0":
   version: 1.2.0
   resolution: "eth-phishing-detect@npm:1.2.0"
@@ -33460,6 +33470,7 @@ __metadata:
     "@metamask/eth-json-rpc-middleware": "npm:^21.0.0"
     "@metamask/eth-json-rpc-provider": "npm:^5.0.1"
     "@metamask/eth-ledger-bridge-keyring": "npm:11.1.2"
+    "@metamask/eth-onekey-keyring": "npm:@metamask-previews/[email protected]"
     "@metamask/eth-qr-keyring": "npm:^1.1.0"
     "@metamask/eth-sig-util": "npm:^8.2.0"
     "@metamask/eth-snap-keyring": "npm:^18.0.2"
@@ -33702,7 +33713,6 @@ __metadata:
     eth-ens-namehash: "npm:^2.0.8"
     eth-lattice-keyring: "patch:eth-lattice-keyring@npm%3A0.12.4#~/.yarn/patches/eth-lattice-keyring-npm-0.12.4-c5fb3fcf54.patch"
     eth-method-registry: "npm:^4.0.0"
-    eth-onekey-bridge-keyring: "npm:^0.3.8"
     ethereumjs-util: "npm:^7.0.10"
     ethers: "npm:^5.7.0"
     extension-port-stream: "npm:^5.0.0"
@@ -36613,6 +36623,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"playwright@npm:^1.14.0":
+  version: 1.44.0
+  resolution: "playwright@npm:1.44.0"
+  dependencies:
+    fsevents: "npm:2.3.2"
+    playwright-core: "npm:1.44.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  bin:
+    playwright: cli.js
+  checksum: 10/a7d8d6c0dee6262f97ab7fe52ec80ddeff7ad21178a9b90eefae56779fb573e8a3987f27619de6e98d8b9b78e9bb66b94f3caf9fbd51c0f1964dcd744dcb3cae
+  languageName: node
+  linkType: hard
+
 "please-upgrade-node@npm:^3.2.0":
   version: 3.2.0
   resolution: "please-upgrade-node@npm:3.2.0"