From 94a58be74244697d2ed77904ebd5d93cd4ec3f4b Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Mon, 9 Sep 2024 17:33:55 +0800
Subject: [PATCH 01/21] feat: add the keystone usb connection

---
 apps/extension/src/languages/en.json          |  4 +
 .../pages/register/connect-keystone/index.tsx |  3 +-
 apps/extension/src/pages/register/index.tsx   | 14 +++-
 .../register/name-password-hardware/index.tsx | 81 ++++++++++++++++++-
 4 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/apps/extension/src/languages/en.json b/apps/extension/src/languages/en.json
index ee49c425bd..41c8fcd01c 100644
--- a/apps/extension/src/languages/en.json
+++ b/apps/extension/src/languages/en.json
@@ -105,6 +105,10 @@
   "pages.register.name-password-hardware.connect-to-terra": "Terra app",
   "pages.register.name-password-hardware.connect-to-secret": "Secret app",
 
+  "pages.register.name-password-hardware.connect-keystone-way": "Connect Keystone via",
+  "pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
+  "pages.register.name-password-hardware.connect-to-keystone-QR": "QR",
+
   "pages.register.recover-mnemonic.title": "Import Existing Wallet",
   "pages.register.recover-mnemonic.paragraph-1": "Enter your recovery phrase here to restore your wallet. Or click on any blank and paste the entire phrase.",
   "pages.register.recover-mnemonic.paragraph-2": "Enter the phrase in the right order without capitalization, punctuation symbols, or spaces.",
diff --git a/apps/extension/src/pages/register/connect-keystone/index.tsx b/apps/extension/src/pages/register/connect-keystone/index.tsx
index 324a651a1e..4de4e439f2 100644
--- a/apps/extension/src/pages/register/connect-keystone/index.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/index.tsx
@@ -12,8 +12,9 @@ import { Button } from "../../../components/button";
 import { ColorPalette } from "../../../styles";
 import { useTheme } from "styled-components";
 import { FormattedMessage, useIntl } from "react-intl";
+export { ConnectKeystoneUSBScene } from "./usb";
 
-export const ConnectKeystoneScene: FunctionComponent<{
+export const ConnectKeystoneQRScene: FunctionComponent<{
   name: string;
   password: string;
   stepPrevious: number;
diff --git a/apps/extension/src/pages/register/index.tsx b/apps/extension/src/pages/register/index.tsx
index b0c91ab2d3..deabc41dba 100644
--- a/apps/extension/src/pages/register/index.tsx
+++ b/apps/extension/src/pages/register/index.tsx
@@ -35,7 +35,10 @@ import { useStore } from "../../stores";
 import { useSearchParams } from "react-router-dom";
 import * as KeplrWalletPrivate from "keplr-wallet-private";
 import { BackUpPrivateKeyScene } from "./back-up-private-key";
-import { ConnectKeystoneScene } from "./connect-keystone";
+import {
+  ConnectKeystoneQRScene,
+  ConnectKeystoneUSBScene,
+} from "./connect-keystone";
 import { ScanKeystoneScene } from "./connect-keystone/scan";
 
 const Container = styled.div`
@@ -230,8 +233,13 @@ const RegisterPageImpl: FunctionComponent = observer(() => {
               width: "40rem",
             },
             {
-              name: "connect-keystone",
-              element: ConnectKeystoneScene,
+              name: "connect-keystone-qr",
+              element: ConnectKeystoneQRScene,
+              width: "40rem",
+            },
+            {
+              name: "connect-keystone-usb",
+              element: ConnectKeystoneUSBScene,
               width: "40rem",
             },
             {
diff --git a/apps/extension/src/pages/register/name-password-hardware/index.tsx b/apps/extension/src/pages/register/name-password-hardware/index.tsx
index 8a93d0550b..d5cc616c3d 100644
--- a/apps/extension/src/pages/register/name-password-hardware/index.tsx
+++ b/apps/extension/src/pages/register/name-password-hardware/index.tsx
@@ -39,10 +39,12 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
   const form = useFormNamePassword();
 
   const [connectTo, setConnectTo] = useState<string>("Cosmos");
-
-  const bip44PathState = useBIP44PathState(type === "ledger");
+  const bip44PathState = useBIP44PathState(true);
   const [isBIP44CardOpen, setIsBIP44CardOpen] = useState(false);
 
+  const [keystoneWay, setKeystoneWay] = useState<string>("USB");
+  const [isKeystoneUSB, setIsUSB] = useState(true);
+
   return (
     <RegisterSceneBox>
       <form
@@ -57,7 +59,16 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
               stepTotal: 3,
             });
           } else if (type === "keystone") {
-            sceneTransition.push("connect-keystone", {
+            if (isKeystoneUSB) {
+              return sceneTransition.push("connect-keystone-usb", {
+                name: data.name,
+                password: data.password,
+                bip44Path: isKeystoneUSB ? bip44PathState.getPath() : undefined,
+                stepPrevious: 1,
+                stepTotal: 3,
+              });
+            }
+            return sceneTransition.push("connect-keystone-qr", {
               name: data.name,
               password: data.password,
               stepPrevious: 1,
@@ -134,6 +145,70 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
               <Gutter size="1.25rem" />
             </React.Fragment>
           ) : undefined}
+          {type === "keystone" ? (
+            <React.Fragment>
+              <Gutter size="1rem" />
+              <Label
+                content={intl.formatMessage({
+                  id: "pages.register.name-password-hardware.connect-keystone-way",
+                })}
+              />
+              <Dropdown
+                color="text-input"
+                size="large"
+                selectedItemKey={keystoneWay}
+                items={[
+                  {
+                    key: "USB",
+                    label: intl.formatMessage({
+                      id: "pages.register.name-password-hardware.connect-to-keystone-USB",
+                    }),
+                  },
+                  {
+                    key: "QR",
+                    label: intl.formatMessage({
+                      id: "pages.register.name-password-hardware.connect-to-keystone-QR",
+                    }),
+                  },
+                ]}
+                onSelect={(key) => {
+                  setKeystoneWay(key);
+                  setIsUSB(key === "USB");
+                }}
+              />
+              <Gutter size="1.625rem" />
+              {isKeystoneUSB && (
+                <React.Fragment>
+                  <VerticalCollapseTransition
+                    width="100%"
+                    collapsed={isBIP44CardOpen}
+                  >
+                    <Box alignX="center">
+                      <Button
+                        size="small"
+                        color="secondary"
+                        text={intl.formatMessage({
+                          id: "button.advanced",
+                        })}
+                        onClick={() => {
+                          setIsBIP44CardOpen(true);
+                        }}
+                      />
+                    </Box>
+                  </VerticalCollapseTransition>
+                  <VerticalCollapseTransition collapsed={!isBIP44CardOpen}>
+                    <SetBip44PathCard
+                      state={bip44PathState}
+                      onClose={() => {
+                        setIsBIP44CardOpen(false);
+                      }}
+                    />
+                  </VerticalCollapseTransition>
+                </React.Fragment>
+              )}
+              <Gutter size="1.25rem" />
+            </React.Fragment>
+          ) : undefined}
         </FormNamePassword>
       </form>
     </RegisterSceneBox>

From 9bfbc7d4629ca4c4b3d5c493598bf54cd0c490f8 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Fri, 13 Sep 2024 17:05:30 +0800
Subject: [PATCH 02/21] add the usb connection function for keystone device

---
 apps/extension/package.json                   |   3 +
 apps/extension/src/languages/en.json          |   3 +
 .../pages/register/connect-keystone/usb.tsx   | 442 ++++++++++++++++++
 yarn.lock                                     | 190 +++++++-
 4 files changed, 636 insertions(+), 2 deletions(-)
 create mode 100644 apps/extension/src/pages/register/connect-keystone/usb.tsx

diff --git a/apps/extension/package.json b/apps/extension/package.json
index c8b2fa5d57..fc8dd288a0 100644
--- a/apps/extension/package.json
+++ b/apps/extension/package.json
@@ -50,6 +50,9 @@
     "@keplr-wallet/types": "0.12.125",
     "@keplr-wallet/unit": "0.12.125",
     "@keystonehq/animated-qr": "^0.8.6",
+    "@keystonehq/hw-app-base": "0.1.1",
+    "@keystonehq/hw-app-eth": "^0.4.4",
+    "@keystonehq/hw-transport-webusb": "^0.4.0-beta.0",
     "@keystonehq/keystone-sdk": "^0.2.3",
     "@ledgerhq/devices": "^6.20.0",
     "@react-spring/web": "^9.6.1",
diff --git a/apps/extension/src/languages/en.json b/apps/extension/src/languages/en.json
index 41c8fcd01c..deb25e968b 100644
--- a/apps/extension/src/languages/en.json
+++ b/apps/extension/src/languages/en.json
@@ -133,6 +133,9 @@
   "pages.register.connect-ledger.use-hid-confirm-paragraph": "Please enable ‘experimental web platform features’ to use Web HID",
 
   "pages.register.connect-keystone.title": "Please Connect Your Hardware Wallet",
+  "pages.register.connect-keystone.paragraph": "Please unlock your Keystone device and connect it to your computer via USB.",
+  "pages.register.connect-keystone.connect-keystone-step-paragraph": "Connect and unlock your Keystone.",
+  "pages.register.connect-keystone.fetch-address-paragraph": "Fetching addresses from your Keystone device.",
   "pages.register.connect-keystone.step-text": "Step {num}",
   "pages.register.connect-keystone.step-1": "Tap “<span>Connect Software Wallet</span>” at the bottom left corner on the Keystone device.",
   "pages.register.connect-keystone.step-2": "Select “<span>Keplr Wallet</span>”.",
diff --git a/apps/extension/src/pages/register/connect-keystone/usb.tsx b/apps/extension/src/pages/register/connect-keystone/usb.tsx
new file mode 100644
index 0000000000..3d39ce92ab
--- /dev/null
+++ b/apps/extension/src/pages/register/connect-keystone/usb.tsx
@@ -0,0 +1,442 @@
+import React, { FunctionComponent, useState } from "react";
+import { RegisterSceneBox } from "../components/register-scene-box";
+import {
+  useSceneEvents,
+  useSceneTransition,
+} from "../../../components/transition";
+import { useRegisterHeader } from "../components/header";
+import { Gutter } from "../../../components/gutter";
+import { Box } from "../../../components/box";
+import { XAxis, YAxis } from "../../../components/axis";
+import { Body1, H2 } from "../../../components/typography";
+import { ColorPalette } from "../../../styles";
+import { Stack } from "../../../components/stack";
+import { Button } from "../../../components/button";
+import {
+  TransportWebUSB,
+  getKeystoneDevices,
+} from "@keystonehq/hw-transport-webusb";
+import Base from "@keystonehq/hw-app-base";
+import { observer } from "mobx-react-lite";
+import { FormattedMessage, useIntl } from "react-intl";
+import { useTheme } from "styled-components";
+import KeystoneSDK, {
+  Curve,
+  DerivationAlgorithm,
+} from "@keystonehq/keystone-sdk";
+import { KeystoneIcon } from "../../../components/icon/keystone";
+import { IconProps } from "../../../components/icon/types";
+
+type Step = "unknown" | "connected" | "app";
+
+export async function createKeystoneTransport() {
+  if ((await getKeystoneDevices()).length <= 0) {
+    try {
+      await TransportWebUSB.requestPermission();
+    } catch (e) {
+      throw new Error("USB_PERMISSIONS_NOT_AVAILABLE");
+    }
+  }
+
+  const transport = await TransportWebUSB.connect({
+    timeout: 100000,
+  });
+  await transport.close();
+  return transport;
+}
+
+const DEFAULT_KEYSTONE_PATHS = [
+  "m/44'/118'/0'/0/0", // cosmos path
+  "m/44'/60'/0'/0/0", // ethereum path
+  "m/44'/529'/0'/0/0",
+  "m/44'/394'/0'/0/0",
+  "m/44'/234'/0'/0/0",
+  "m/44'/564'/0'/0/0",
+  "m/44'/459'/0'/0/0",
+  "m/44'/330'/0'/0/0",
+];
+
+const isDefaultPath = (bip44Path: {
+  account: number;
+  change: number;
+  addressIndex: number;
+}) => {
+  return (
+    bip44Path.account === 0 &&
+    bip44Path.change === 0 &&
+    bip44Path.addressIndex === 0
+  );
+};
+
+export const ConnectKeystoneUSBScene: FunctionComponent<{
+  name: string;
+  password: string;
+  bip44Path: {
+    account: number;
+    change: number;
+    addressIndex: number;
+  };
+  stepPrevious: number;
+  stepTotal: number;
+}> = observer(({ name, password, bip44Path, stepPrevious, stepTotal }) => {
+  const intl = useIntl();
+
+  const sceneTransition = useSceneTransition();
+
+  const header = useRegisterHeader();
+  useSceneEvents({
+    onWillVisible: () => {
+      header.setHeader({
+        mode: "step",
+        title: intl.formatMessage({
+          id: "pages.register.connect-keystone.title",
+        }),
+        paragraphs: [
+          intl.formatMessage({
+            id: "pages.register.connect-keystone.paragraph",
+          }),
+        ],
+        stepCurrent: stepPrevious + 1,
+        stepTotal: stepTotal,
+      });
+    },
+  });
+
+  const [step, setStep] = useState<Step>("unknown");
+  const [isLoading, setIsLoading] = useState(false);
+
+  const connectKeystone = async () => {
+    setIsLoading(true);
+
+    let transport: TransportWebUSB;
+
+    try {
+      transport = await createKeystoneTransport();
+    } catch {
+      setStep("unknown");
+      setIsLoading(false);
+      return;
+    }
+
+    const baseApp = new Base(transport as any);
+
+    // step1: make sure the device is connected and unlocked
+    try {
+      await baseApp.getAppConfig();
+      setStep("connected");
+    } catch (e) {
+      console.log(e);
+      setStep("unknown");
+      setIsLoading(false);
+      return;
+    }
+
+    // step2: get the keystone accounts
+    const keys = [];
+    let device: string | undefined;
+    let masterFingerprint = "";
+    let deviceId: string | undefined;
+    let accounts;
+
+    try {
+      if (!isDefaultPath(bip44Path)) {
+        const setPath = `m/44'/118'/${bip44Path.account}'/${bip44Path.change}/${bip44Path.addressIndex}`;
+        const res = await baseApp.getURAccount(
+          setPath,
+          Curve.secp256k1,
+          DerivationAlgorithm.slip10
+        );
+        const sdk = new KeystoneSDK({
+          origin: "Keplr Extension",
+        });
+        accounts = sdk.parseMultiAccounts(res.toUR());
+      } else {
+        for (const path of DEFAULT_KEYSTONE_PATHS) {
+          const res = await baseApp.getURAccount(
+            path,
+            Curve.secp256k1,
+            DerivationAlgorithm.slip10
+          );
+          const sdk = new KeystoneSDK({
+            origin: "Keplr Extension",
+          });
+          const account = sdk.parseMultiAccounts(res.toUR());
+          keys.push(account.keys[0]);
+          device = account.device;
+          deviceId = account.deviceId;
+          masterFingerprint = account.masterFingerprint;
+          accounts = {
+            device,
+            deviceId,
+            masterFingerprint,
+            keys,
+          };
+        }
+      }
+
+      setStep("app");
+      //
+      sceneTransition.replaceAll("finalize-key", {
+        name,
+        password,
+        keystone: accounts,
+        stepPrevious: stepPrevious + 1,
+        stepTotal,
+        type: "usb",
+      });
+    } catch (e) {
+      console.log(e);
+      setStep("unknown");
+    }
+    setIsLoading(false);
+
+    return;
+  };
+
+  return (
+    <RegisterSceneBox>
+      <Stack gutter="1.25rem">
+        <StepView
+          step={1}
+          paragraph={intl.formatMessage({
+            id: "pages.register.connect-keystone.connect-keystone-step-paragraph",
+          })}
+          icon={
+            <Box style={{ opacity: step !== "unknown" ? 0.5 : 1 }}>
+              <KeystoneIcon />
+            </Box>
+          }
+          focused={step === "unknown"}
+          completed={step !== "unknown"}
+        />
+        <StepView
+          step={2}
+          paragraph={intl.formatMessage({
+            id: "pages.register.connect-keystone.fetch-address-paragraph",
+          })}
+          icon={
+            <Box style={{ opacity: step !== "connected" ? 0.5 : 1 }}>
+              <KeystoneConnectIcon width={32} height={27} />
+            </Box>
+          }
+          focused={step === "connected"}
+          completed={step === "app"}
+        />
+      </Stack>
+      <Gutter size="1.25rem" />
+      <Box width="22.5rem" marginX="auto">
+        <Button
+          text={intl.formatMessage({
+            id: "button.next",
+          })}
+          size="large"
+          isLoading={isLoading}
+          onClick={connectKeystone}
+        />
+      </Box>
+    </RegisterSceneBox>
+  );
+});
+
+const StepView: FunctionComponent<{
+  step: number;
+  paragraph: string;
+  icon?: React.ReactNode;
+
+  focused: boolean;
+  completed: boolean;
+}> = ({ step, paragraph, icon, focused, completed }) => {
+  const theme = useTheme();
+
+  return (
+    <Box
+      paddingX="2rem"
+      paddingY="1.25rem"
+      borderRadius="1.125rem"
+      backgroundColor={
+        focused
+          ? theme.mode === "light"
+            ? ColorPalette["gray-50"]
+            : ColorPalette["gray-500"]
+          : theme.mode === "light"
+          ? "none"
+          : "transparent"
+      }
+    >
+      <XAxis alignY="center">
+        <div>{icon}</div>
+        <Gutter size="1.25rem" />
+        <YAxis>
+          <XAxis>
+            <H2
+              style={{
+                color: focused
+                  ? theme.mode === "light"
+                    ? ColorPalette["gray-400"]
+                    : ColorPalette["gray-10"]
+                  : theme.mode === "light"
+                  ? ColorPalette["gray-200"]
+                  : ColorPalette["gray-300"],
+              }}
+            >
+              <FormattedMessage
+                id="pages.register.connect-ledger.step-text"
+                values={{ step }}
+              />
+            </H2>
+            {completed ? (
+              <React.Fragment>
+                <Gutter size="0.25rem" />
+                <CheckIcon
+                  color={
+                    focused ? ColorPalette["gray-10"] : ColorPalette["gray-300"]
+                  }
+                />
+              </React.Fragment>
+            ) : null}
+          </XAxis>
+          <Gutter size="0.5rem" />
+          <Body1
+            style={{
+              color: focused
+                ? theme.mode === "light"
+                  ? ColorPalette["gray-300"]
+                  : ColorPalette["gray-200"]
+                : theme.mode === "light"
+                ? ColorPalette["gray-200"]
+                : ColorPalette["gray-300"],
+            }}
+          >
+            {paragraph}
+          </Body1>
+        </YAxis>
+      </XAxis>
+    </Box>
+  );
+};
+
+const CheckIcon: FunctionComponent<{
+  color: string;
+}> = ({ color }) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="25"
+      fill="none"
+      viewBox="0 0 24 25"
+    >
+      <path
+        fill={color}
+        d="M9 16.67L4.83 12.5l-1.42 1.41L9 19.5l12-12-1.41-1.41L9 16.67z"
+      />
+    </svg>
+  );
+};
+
+const KeystoneConnectIcon: FunctionComponent<IconProps> = ({
+  width,
+  height,
+}) => {
+  return (
+    <svg width={width} height={height} viewBox="0 0 320 270" fill="none">
+      <circle
+        cx="163.077"
+        cy="134.769"
+        r="129.077"
+        stroke="#505766"
+        strokeOpacity="0.6"
+        strokeWidth="4"
+      />
+      <path d="M118 72H206V197H118V72Z" stroke="#787A8D" strokeWidth="4" />
+      <path
+        d="M125 79H199V183H125V79Z"
+        fill="url(#paint0_linear_1099_541)"
+        fillOpacity="0.4"
+      />
+      <path
+        d="M125 79H199V183H125V79Z"
+        fill="url(#paint1_radial_1099_541)"
+        fillOpacity="0.2"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M131 93H149.5V98H131V93ZM131 102H178V107H131V102ZM154 111H131V116H154V111Z"
+        fill="#787A8D"
+      />
+      <rect
+        x="2"
+        y="13.0771"
+        width="94.4615"
+        height="94.4615"
+        rx="47.2308"
+        fill="#040A18"
+      />
+      <rect
+        x="2"
+        y="13.0771"
+        width="94.4615"
+        height="94.4615"
+        rx="47.2308"
+        stroke="#4F4F59"
+        strokeWidth="4"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M58.4613 48.0008L49.2306 36.7188L39.9998 48.0008H47.1793V75.0331L39.9998 70.4645V66.0356C41.811 65.2443 43.0767 63.437 43.0767 61.3341C43.0767 58.5019 40.7807 56.2059 37.9485 56.2059C35.1163 56.2059 32.8203 58.5019 32.8203 61.3341C32.8203 63.437 34.0861 65.2443 35.8972 66.0356V71.5905V72.7166L36.8473 73.3212L47.1793 79.8959V80.1376V82.1888H51.2819V80.1376V75.7935L61.6139 69.2186L62.5639 68.614V67.488V61.3341H65.128V52.1034H55.8972V61.3341H58.4613V66.3619L51.2819 70.9307V48.0008H58.4613Z"
+        fill="white"
+        fillOpacity="0.9"
+      />
+      <rect
+        x="223.538"
+        y="160.77"
+        width="94.4615"
+        height="94.4615"
+        rx="47.2308"
+        fill="#040A18"
+      />
+      <rect
+        x="223.538"
+        y="160.77"
+        width="94.4615"
+        height="94.4615"
+        rx="47.2308"
+        stroke="#4F4F59"
+        strokeWidth="4"
+      />
+      <path
+        d="M265.299 224.41H254.358V216.205M276.239 224.41H287.179V216.205M276.239 191.59H287.179V199.795M265.299 191.59H254.358V199.795"
+        stroke="white"
+        strokeOpacity="0.9"
+        strokeWidth="4.10256"
+      />
+      <path d="M252.308 208H289.231" stroke="white" strokeWidth="4.10256" />
+      <defs>
+        <linearGradient
+          id="paint0_linear_1099_541"
+          x1="125"
+          y1="79"
+          x2="138.205"
+          y2="183.585"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="white" stopOpacity="0.6" />
+          <stop offset="1" stopColor="white" stopOpacity="0.1" />
+        </linearGradient>
+        <radialGradient
+          id="paint1_radial_1099_541"
+          cx="0"
+          cy="0"
+          r="1"
+          gradientUnits="userSpaceOnUse"
+          gradientTransform="translate(125 79) rotate(52.6346) scale(60.9659 64.3597)"
+        >
+          <stop stopColor="white" />
+          <stop offset="1" stopColor="white" stopOpacity="0.2" />
+        </radialGradient>
+      </defs>
+    </svg>
+  );
+};
diff --git a/yarn.lock b/yarn.lock
index 96ecbc35f8..0024cc5f3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6538,7 +6538,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:^3.5.2":
+"@ethereumjs/rlp@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@ethereumjs/rlp@npm:5.0.2"
+  bin:
+    rlp: bin/rlp.cjs
+  checksum: b569061ddb1f4cf56a82f7a677c735ba37f9e94e2bbaf567404beb9e2da7aa1f595e72fc12a17c61f7aec67fd5448443efe542967c685a2fe0ffc435793dcbab
+  languageName: node
+  linkType: hard
+
+"@ethereumjs/tx@npm:^3.3.2, @ethereumjs/tx@npm:^3.5.2":
   version: 3.5.2
   resolution: "@ethereumjs/tx@npm:3.5.2"
   dependencies:
@@ -6559,6 +6568,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethereumjs/util@npm:^9.0.3":
+  version: 9.1.0
+  resolution: "@ethereumjs/util@npm:9.1.0"
+  dependencies:
+    "@ethereumjs/rlp": ^5.0.2
+    ethereum-cryptography: ^2.2.1
+  checksum: 594e009c3001ca1ca658b4ded01b38e72f5dd5dd76389efd90cb020de099176a3327685557df268161ac3144333cfe8abaae68cda8ae035d9cc82409d386d79a
+  languageName: node
+  linkType: hard
+
 "@ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.7.0":
   version: 5.7.0
   resolution: "@ethersproject/abi@npm:5.7.0"
@@ -8755,6 +8774,9 @@ __metadata:
     "@keplr-wallet/types": 0.12.125
     "@keplr-wallet/unit": 0.12.125
     "@keystonehq/animated-qr": ^0.8.6
+    "@keystonehq/hw-app-base": 0.1.1
+    "@keystonehq/hw-app-eth": ^0.4.4
+    "@keystonehq/hw-transport-webusb": ^0.4.0-beta.0
     "@keystonehq/keystone-sdk": ^0.2.3
     "@ledgerhq/devices": ^6.20.0
     "@react-spring/web": ^9.6.1
@@ -9360,6 +9382,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@keystonehq/bc-ur-registry-eth@npm:^0.8.1-alpha.0":
+  version: 0.8.1-alpha.0
+  resolution: "@keystonehq/bc-ur-registry-eth@npm:0.8.1-alpha.0"
+  dependencies:
+    "@keystonehq/bc-ur-registry": ^0.5.0-alpha.4
+    ethereumjs-util: ^7.0.8
+    hdkey: ^2.0.1
+    uuid: ^8.3.2
+  checksum: e7bd081a17a3f5d688d49ef96a44025c2262dd80c31813857b659ab2879659b41f9e8830832047da052eaeedb10de27dd4f6dba64e378e6054f7611f04b876d8
+  languageName: node
+  linkType: hard
+
 "@keystonehq/bc-ur-registry-evm@npm:^0.5.2":
   version: 0.5.2
   resolution: "@keystonehq/bc-ur-registry-evm@npm:0.5.2"
@@ -9423,6 +9457,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@keystonehq/bc-ur-registry@npm:0.7.0":
+  version: 0.7.0
+  resolution: "@keystonehq/bc-ur-registry@npm:0.7.0"
+  dependencies:
+    "@ngraveio/bc-ur": ^1.1.5
+    bs58check: ^2.1.2
+    tslib: ^2.3.0
+  checksum: d6017e8fda67fc01e28aa1c047b20cce8f07b026f110a5771920879fbd658b845f529b054d1dce2fbabadcfd8da47a2160ab50c73f0bd56678aab4d83899ffcc
+  languageName: node
+  linkType: hard
+
 "@keystonehq/bc-ur-registry@npm:^0.4.4":
   version: 0.4.4
   resolution: "@keystonehq/bc-ur-registry@npm:0.4.4"
@@ -9434,7 +9479,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/bc-ur-registry@npm:^0.5.4, @keystonehq/bc-ur-registry@npm:^0.5.5":
+"@keystonehq/bc-ur-registry@npm:^0.5.0-alpha.4, @keystonehq/bc-ur-registry@npm:^0.5.4, @keystonehq/bc-ur-registry@npm:^0.5.5":
   version: 0.5.5
   resolution: "@keystonehq/bc-ur-registry@npm:0.5.5"
   dependencies:
@@ -9456,6 +9501,65 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@keystonehq/hw-app-base@npm:0.1.1":
+  version: 0.1.1
+  resolution: "@keystonehq/hw-app-base@npm:0.1.1"
+  dependencies:
+    "@keystonehq/bc-ur-registry": 0.7.0
+    "@keystonehq/hw-transport-error": ^0.0.2
+    "@keystonehq/hw-transport-webusb": ^0.4.0-beta.0
+    "@ngraveio/bc-ur": ^1.1.6
+    uuid: ^8.3.2
+  checksum: 8f8b51f473d8f0998e0124dd73cfa2c212952e1e814369137e4788e2985a2fdd0f1d84e48ddafd70132e60c06ef2276a3637324c265a40eae9369b8d525a0fe7
+  languageName: node
+  linkType: hard
+
+"@keystonehq/hw-app-eth@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "@keystonehq/hw-app-eth@npm:0.4.4"
+  dependencies:
+    "@ethereumjs/tx": ^3.3.2
+    "@ethereumjs/util": ^9.0.3
+    "@keystonehq/bc-ur-registry": 0.7.0
+    "@keystonehq/bc-ur-registry-eth": ^0.8.1-alpha.0
+    "@keystonehq/hw-transport-error": ^0.0.2
+    "@keystonehq/hw-transport-webusb": ^0.3.2
+    "@ngraveio/bc-ur": ^1.1.6
+    buffer: ^6.0.3
+    elliptic: ^6.5.7
+    rlp: ^2.2.6
+    uuid: ^8.3.2
+  checksum: c795021dc05bcc70c082f260ca7bc1d98c4bcf6711796f5afd50fb674cbcdf89c78151ebbd1ff9807175ecff8908e7c6a8ec5fe20d82769fae91464dce2f28d0
+  languageName: node
+  linkType: hard
+
+"@keystonehq/hw-transport-error@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "@keystonehq/hw-transport-error@npm:0.0.2"
+  checksum: 681c3344fdd5e59b63ee522a4539fff926c0c050dc645070dfaa4ac73b5c913312667aa491ec2174252e553d83f4c7e90e2dad2a80e9cbcdb4fa40e86565ccf2
+  languageName: node
+  linkType: hard
+
+"@keystonehq/hw-transport-webusb@npm:^0.3.2":
+  version: 0.3.3
+  resolution: "@keystonehq/hw-transport-webusb@npm:0.3.3"
+  dependencies:
+    "@keystonehq/hw-transport-error": ^0.0.2
+    buffer: ^6.0.3
+  checksum: 2212d50cb5d6b59c41ab8797688af149a309adfc17f3010beab1f976f47aa3a36770049513c31854b34b683e54a8b40521f674bb676f02a5624f6f15404f21df
+  languageName: node
+  linkType: hard
+
+"@keystonehq/hw-transport-webusb@npm:^0.4.0-beta.0":
+  version: 0.4.0-beta.0
+  resolution: "@keystonehq/hw-transport-webusb@npm:0.4.0-beta.0"
+  dependencies:
+    "@keystonehq/hw-transport-error": ^0.0.2
+    buffer: ^6.0.3
+  checksum: 70c85917bb234ae6bd420ecb0744647ca8358f67b1eb043814f45567a0eb1b73ac6c8699cbdc877ad77f9d0a70d8ec5859b73aa4bfdfff8b29fad7dee2fce216
+  languageName: node
+  linkType: hard
+
 "@keystonehq/keystone-sdk@npm:^0.2.3":
   version: 0.2.3
   resolution: "@keystonehq/keystone-sdk@npm:0.2.3"
@@ -10510,6 +10614,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/curves@npm:1.4.2, @noble/curves@npm:~1.4.0":
+  version: 1.4.2
+  resolution: "@noble/curves@npm:1.4.2"
+  dependencies:
+    "@noble/hashes": 1.4.0
+  checksum: c475a83c4263e2c970eaba728895b9b5d67e0ca880651e9c6e3efdc5f6a4f07ceb5b043bf71c399fc80fada0b8706e69d0772bffdd7b9de2483b988973a34cba
+  languageName: node
+  linkType: hard
+
 "@noble/hashes@npm:1.0.0":
   version: 1.0.0
   resolution: "@noble/hashes@npm:1.0.0"
@@ -10524,6 +10637,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/hashes@npm:1.4.0, @noble/hashes@npm:~1.4.0":
+  version: 1.4.0
+  resolution: "@noble/hashes@npm:1.4.0"
+  checksum: 8ba816ae26c90764b8c42493eea383716396096c5f7ba6bea559993194f49d80a73c081f315f4c367e51bd2d5891700bcdfa816b421d24ab45b41cb03e4f3342
+  languageName: node
+  linkType: hard
+
 "@noble/hashes@npm:^1, @noble/hashes@npm:^1.0.0":
   version: 1.1.3
   resolution: "@noble/hashes@npm:1.1.3"
@@ -12501,6 +12621,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/base@npm:~1.1.6":
+  version: 1.1.8
+  resolution: "@scure/base@npm:1.1.8"
+  checksum: 1fc8a355ba68663c0eb430cf6a2c5ff5af790c347c1ba1953f344e8681ab37e37e2545e495f7f971b0245727d710fea8c1e57d232d0c6c543cbed4965c7596a1
+  languageName: node
+  linkType: hard
+
 "@scure/bip32@npm:1.3.0":
   version: 1.3.0
   resolution: "@scure/bip32@npm:1.3.0"
@@ -12512,6 +12639,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/bip32@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@scure/bip32@npm:1.4.0"
+  dependencies:
+    "@noble/curves": ~1.4.0
+    "@noble/hashes": ~1.4.0
+    "@scure/base": ~1.1.6
+  checksum: eff491651cbf2bea8784936de75af5fc020fc1bbb9bcb26b2cfeefbd1fb2440ebfaf30c0733ca11c0ae1e272a2ef4c3c34ba5c9fb3e1091c3285a4272045b0c6
+  languageName: node
+  linkType: hard
+
 "@scure/bip39@npm:1.2.0":
   version: 1.2.0
   resolution: "@scure/bip39@npm:1.2.0"
@@ -12522,6 +12660,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@scure/bip39@npm:1.3.0":
+  version: 1.3.0
+  resolution: "@scure/bip39@npm:1.3.0"
+  dependencies:
+    "@noble/hashes": ~1.4.0
+    "@scure/base": ~1.1.6
+  checksum: dbb0b27df753eb6c6380010b25cc9a9ea31f9cb08864fc51e69e5880ff7e2b8f85b72caea1f1f28af165e83b72c48dd38617e43fc632779d025b50ba32ea759e
+  languageName: node
+  linkType: hard
+
 "@segment/loosely-validate-event@npm:^2.0.0":
   version: 2.0.0
   resolution: "@segment/loosely-validate-event@npm:2.0.0"
@@ -22053,6 +22201,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"elliptic@npm:^6.5.7":
+  version: 6.5.7
+  resolution: "elliptic@npm:6.5.7"
+  dependencies:
+    bn.js: ^4.11.9
+    brorand: ^1.1.0
+    hash.js: ^1.0.0
+    hmac-drbg: ^1.0.1
+    inherits: ^2.0.4
+    minimalistic-assert: ^1.0.1
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8
+  languageName: node
+  linkType: hard
+
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
@@ -23399,6 +23562,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ethereum-cryptography@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "ethereum-cryptography@npm:2.2.1"
+  dependencies:
+    "@noble/curves": 1.4.2
+    "@noble/hashes": 1.4.0
+    "@scure/bip32": 1.4.0
+    "@scure/bip39": 1.3.0
+  checksum: 1466e4c417b315a6ac67f95088b769fafac8902b495aada3c6375d827e5a7882f9e0eea5f5451600d2250283d9198b8a3d4d996e374e07a80a324e29136f25c6
+  languageName: node
+  linkType: hard
+
 "ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.0, ethereumjs-util@npm:^7.1.5":
   version: 7.1.5
   resolution: "ethereumjs-util@npm:7.1.5"
@@ -38449,6 +38624,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rlp@npm:^2.2.6":
+  version: 2.2.7
+  resolution: "rlp@npm:2.2.7"
+  dependencies:
+    bn.js: ^5.2.0
+  bin:
+    rlp: bin/rlp
+  checksum: 3db4dfe5c793f40ac7e0be689a1f75d05e6f2ca0c66189aeb62adab8c436b857ab4420a419251ee60370d41d957a55698fc5e23ab1e1b41715f33217bc4bb558
+  languageName: node
+  linkType: hard
+
 "rn-fetch-blob@npm:0.13.0-beta.2":
   version: 0.13.0-beta.2
   resolution: "rn-fetch-blob@npm:0.13.0-beta.2"

From a7f37bce0741d1b770d985ae3b88c1f33de33532 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Fri, 13 Sep 2024 17:27:48 +0800
Subject: [PATCH 03/21] enhance the current data for adding connection type

---
 apps/extension/src/pages/register/connect-keystone/scan.tsx | 3 ++-
 apps/extension/src/pages/register/connect-keystone/usb.tsx  | 6 +++++-
 apps/extension/src/pages/register/finalize-key/index.tsx    | 4 +++-
 packages/background/src/keyring-keystone/service.ts         | 1 +
 packages/background/src/keyring-keystone/types.ts           | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/extension/src/pages/register/connect-keystone/scan.tsx b/apps/extension/src/pages/register/connect-keystone/scan.tsx
index 59bb2c3126..b2eb1c5771 100644
--- a/apps/extension/src/pages/register/connect-keystone/scan.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/scan.tsx
@@ -57,10 +57,11 @@ export const ScanKeystoneScene: FunctionComponent<{
     const accounts = sdk.parseMultiAccounts(
       new UR(Buffer.from(ur.cbor, "hex"), ur.type)
     );
+    const enhancedAccounts = { ...accounts, connectionType: "QR" };
     sceneTransition.replaceAll("finalize-key", {
       name,
       password,
-      keystone: accounts,
+      keystone: enhancedAccounts,
       stepPrevious: stepPrevious + 1,
       stepTotal,
     });
diff --git a/apps/extension/src/pages/register/connect-keystone/usb.tsx b/apps/extension/src/pages/register/connect-keystone/usb.tsx
index 3d39ce92ab..16f43881bd 100644
--- a/apps/extension/src/pages/register/connect-keystone/usb.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/usb.tsx
@@ -150,6 +150,10 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
           origin: "Keplr Extension",
         });
         accounts = sdk.parseMultiAccounts(res.toUR());
+        accounts = {
+          ...accounts,
+          connectionType: "USB",
+        };
       } else {
         for (const path of DEFAULT_KEYSTONE_PATHS) {
           const res = await baseApp.getURAccount(
@@ -170,6 +174,7 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
             deviceId,
             masterFingerprint,
             keys,
+            connectionType: "USB",
           };
         }
       }
@@ -182,7 +187,6 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
         keystone: accounts,
         stepPrevious: stepPrevious + 1,
         stepTotal,
-        type: "usb",
       });
     } catch (e) {
       console.log(e);
diff --git a/apps/extension/src/pages/register/finalize-key/index.tsx b/apps/extension/src/pages/register/finalize-key/index.tsx
index 763dff884a..cc72b8a080 100644
--- a/apps/extension/src/pages/register/finalize-key/index.tsx
+++ b/apps/extension/src/pages/register/finalize-key/index.tsx
@@ -54,7 +54,9 @@ export const FinalizeKeyScene: FunctionComponent<{
       addressIndex: number;
     };
   };
-  keystone?: MultiAccounts;
+  keystone?: MultiAccounts & {
+    connectionType?: "USB" | "QR";
+  };
   stepPrevious: number;
   stepTotal: number;
 }> = observer(
diff --git a/packages/background/src/keyring-keystone/service.ts b/packages/background/src/keyring-keystone/service.ts
index 1592925616..ec03e9e25e 100644
--- a/packages/background/src/keyring-keystone/service.ts
+++ b/packages/background/src/keyring-keystone/service.ts
@@ -31,6 +31,7 @@ export class KeyRingKeystoneService {
         device: multiAccounts.device,
         deviceId: multiAccounts.deviceId,
         keys,
+        connectionType: multiAccounts.connectionType,
       },
       sensitive: {},
     });
diff --git a/packages/background/src/keyring-keystone/types.ts b/packages/background/src/keyring-keystone/types.ts
index 4ccd8a8b94..4d56cb0c7d 100644
--- a/packages/background/src/keyring-keystone/types.ts
+++ b/packages/background/src/keyring-keystone/types.ts
@@ -3,6 +3,7 @@ export interface MultiAccounts {
   keys: Account[];
   device?: string;
   deviceId?: string;
+  connectionType?: "USB" | "QR";
 }
 
 export interface Account {

From 5c87b5bc0dff4cef5c0c5597a09400b310f8f28b Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Thu, 19 Sep 2024 15:59:42 +0800
Subject: [PATCH 04/21] add the keystone usb signing for cosmos tx

---
 .../pages/register/connect-keystone/usb.tsx   | 22 +-------
 .../src/pages/sign/cosmos/tx/view.tsx         | 55 ++++++++++++-------
 .../pages/sign/utils/handle-cosmos-sign.ts    | 41 ++++++++++++--
 .../src/pages/sign/utils/keystone.ts          |  1 +
 4 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/apps/extension/src/pages/register/connect-keystone/usb.tsx b/apps/extension/src/pages/register/connect-keystone/usb.tsx
index 16f43881bd..673d56160c 100644
--- a/apps/extension/src/pages/register/connect-keystone/usb.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/usb.tsx
@@ -12,11 +12,9 @@ import { Body1, H2 } from "../../../components/typography";
 import { ColorPalette } from "../../../styles";
 import { Stack } from "../../../components/stack";
 import { Button } from "../../../components/button";
-import {
-  TransportWebUSB,
-  getKeystoneDevices,
-} from "@keystonehq/hw-transport-webusb";
+import { TransportWebUSB } from "@keystonehq/hw-transport-webusb";
 import Base from "@keystonehq/hw-app-base";
+import { createKeystoneTransport } from "../../../utils/keystone";
 import { observer } from "mobx-react-lite";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useTheme } from "styled-components";
@@ -29,22 +27,6 @@ import { IconProps } from "../../../components/icon/types";
 
 type Step = "unknown" | "connected" | "app";
 
-export async function createKeystoneTransport() {
-  if ((await getKeystoneDevices()).length <= 0) {
-    try {
-      await TransportWebUSB.requestPermission();
-    } catch (e) {
-      throw new Error("USB_PERMISSIONS_NOT_AVAILABLE");
-    }
-  }
-
-  const transport = await TransportWebUSB.connect({
-    timeout: 100000,
-  });
-  await transport.close();
-  return transport;
-}
-
 const DEFAULT_KEYSTONE_PATHS = [
   "m/44'/118'/0'/0/0", // cosmos path
   "m/44'/60'/0'/0/0", // ethereum path
diff --git a/apps/extension/src/pages/sign/cosmos/tx/view.tsx b/apps/extension/src/pages/sign/cosmos/tx/view.tsx
index 75ef21984b..61a89f2da0 100644
--- a/apps/extension/src/pages/sign/cosmos/tx/view.tsx
+++ b/apps/extension/src/pages/sign/cosmos/tx/view.tsx
@@ -30,6 +30,7 @@ import { handleCosmosPreSign } from "../../utils/handle-cosmos-sign";
 import { KeplrError } from "@keplr-wallet/router";
 import { ErrModuleLedgerSign } from "../../utils/ledger-types";
 import { LedgerGuideBox } from "../../components/ledger-guide-box";
+import { KeystoneUSBBox } from "../../components/keystone-usb-box";
 import { Gutter } from "../../../../components/gutter";
 import { GuideBox } from "../../../../components/guide-box";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -338,6 +339,9 @@ export const CosmosTxView: FunctionComponent<{
     Error | undefined
   >(undefined);
 
+  const isKeystonUSB =
+    interactionData.data.keyInsensitive["connectionType"] === "USB";
+
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
   const [keystoneUR, setKeystoneUR] = useState<KeystoneUR>();
   const keystoneScanResolve = useRef<(ur: KeystoneUR) => void>();
@@ -386,6 +390,7 @@ export const CosmosTxView: FunctionComponent<{
         };
       } else if (interactionData.data.keyType === "keystone") {
         setIsKeystoneInteracting(true);
+        setKeystoneInteractingError(undefined);
         const isEthSigning = KeyRingService.isEthermintLike(
           chainStore.getChain(chainId)
         );
@@ -460,6 +465,7 @@ export const CosmosTxView: FunctionComponent<{
         }
       } finally {
         setIsLedgerInteracting(false);
+        setIsKeystoneInteracting(false);
       }
     }
   };
@@ -499,7 +505,8 @@ export const CosmosTxView: FunctionComponent<{
         disabled: buttonDisabled,
         isLoading:
           signInteractionStore.isObsoleteInteraction(interactionData.id) ||
-          isLedgerInteracting,
+          isLedgerInteracting ||
+          isKeystoneInteracting,
         onClick: approve,
       }}
     >
@@ -735,27 +742,35 @@ export const CosmosTxView: FunctionComponent<{
           ledgerInteractingError={ledgerInteractingError}
           isInternal={interactionData.isInternal}
         />
+        {isKeystonUSB && (
+          <KeystoneUSBBox
+            isKeystoneInteracting={isKeystoneInteracting}
+            KeystoneInteractingError={keystoneInteractingError}
+          />
+        )}
       </Box>
-      <KeystoneSign
-        ur={keystoneUR}
-        isOpen={isKeystoneInteracting}
-        close={() => {
-          setIsKeystoneInteracting(false);
-        }}
-        onScan={(ur) => {
-          if (keystoneScanResolve.current === undefined) {
-            throw new Error("Keystone Scan Error");
-          }
-          keystoneScanResolve.current(ur);
-        }}
-        error={keystoneInteractingError}
-        onCloseError={() => {
-          if (keystoneInteractingError) {
+      {!isKeystonUSB && (
+        <KeystoneSign
+          ur={keystoneUR}
+          isOpen={isKeystoneInteracting}
+          close={() => {
             setIsKeystoneInteracting(false);
-          }
-          setKeystoneInteractingError(undefined);
-        }}
-      />
+          }}
+          onScan={(ur) => {
+            if (keystoneScanResolve.current === undefined) {
+              throw new Error("Keystone Scan Error");
+            }
+            keystoneScanResolve.current(ur);
+          }}
+          error={keystoneInteractingError}
+          onCloseError={() => {
+            if (keystoneInteractingError) {
+              setIsKeystoneInteracting(false);
+            }
+            setKeystoneInteractingError(undefined);
+          }}
+        />
+      )}
     </HeaderLayout>
   );
 });
diff --git a/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts b/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
index b3ce1d3d4f..4f7de1bdf5 100644
--- a/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
+++ b/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
@@ -14,6 +14,7 @@ import KeystoneSDK, {
   KeystoneEvmSDK,
   UR,
   utils,
+  UREncoder,
 } from "@keystonehq/keystone-sdk";
 import {
   ErrInvalidPublicKey,
@@ -21,10 +22,13 @@ import {
   ErrInvalidSignature,
   ErrInvalidSigner,
   ErrModuleKeystoneSign,
+  ErrKeystoneUSBCommunication,
   KeystoneKeys,
   KeystoneUR,
   getPathFromPubKey,
 } from "./keystone";
+import { createKeystoneTransport } from "../../../utils/keystone";
+import Base from "@keystonehq/hw-app-base";
 import { PlainObject } from "@keplr-wallet/background";
 import { KeplrError } from "@keplr-wallet/router";
 
@@ -141,6 +145,8 @@ export const handleCosmosPreSign = async (
           : serializeSignDoc(signDocWrapper.aminoSignDoc)
       ).toString("hex");
       const xfp = interactionData.data.keyInsensitive["xfp"] as string;
+      const isUSB =
+        interactionData.data.keyInsensitive["connectionType"] === "USB";
       if (isEthSigning) {
         ur = keystoneSDK.evm.generateSignRequest({
           requestId,
@@ -181,17 +187,40 @@ export const handleCosmosPreSign = async (
           ],
         });
       }
-      await keystoneOptions.displayQRCode({
-        type: ur.type,
-        cbor: ur.cbor.toString("hex"),
-      });
-      const scanResult = await keystoneOptions.scanQRCode();
+
+      // Keystone usb signing
+      let urResult: KeystoneUR;
+      if (isUSB) {
+        try {
+          const transport = await createKeystoneTransport();
+          const URString = new UREncoder(ur, Infinity).nextPart().toUpperCase();
+          const baseApp = new Base(transport as any);
+          const response = await baseApp.sendURRequest(URString);
+          urResult = {
+            type: response.type,
+            cbor: response.cbor.toString("hex"),
+          } as KeystoneUR;
+        } catch (e) {
+          throw new KeplrError(
+            ErrModuleKeystoneSign,
+            ErrKeystoneUSBCommunication,
+            "Keystone USB communication error, Please try again."
+          );
+        }
+      } else {
+        await keystoneOptions.displayQRCode({
+          type: ur.type,
+          cbor: ur.cbor.toString("hex"),
+        });
+        urResult = await keystoneOptions.scanQRCode();
+      }
+
       let signResult;
       try {
         signResult = keystoneSDK[
           isEthSigning ? "evm" : "cosmos"
         ].parseSignature(
-          new UR(Buffer.from(scanResult.cbor, "hex"), scanResult.type)
+          new UR(Buffer.from(urResult.cbor, "hex"), urResult.type)
         );
       } catch (e) {
         throw new KeplrError(
diff --git a/apps/extension/src/pages/sign/utils/keystone.ts b/apps/extension/src/pages/sign/utils/keystone.ts
index 25bba14369..1821f0f7df 100644
--- a/apps/extension/src/pages/sign/utils/keystone.ts
+++ b/apps/extension/src/pages/sign/utils/keystone.ts
@@ -81,3 +81,4 @@ export const ErrInvalidSigner = 1;
 export const ErrInvalidRequestId = 2;
 export const ErrInvalidPublicKey = 3;
 export const ErrInvalidSignature = 4;
+export const ErrKeystoneUSBCommunication = 5;

From 2688764c21604700a3456b7d144b31d9ecc6d179 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Thu, 19 Sep 2024 16:00:37 +0800
Subject: [PATCH 05/21] add the keystone usb box component

---
 .../sign/components/keystone-usb-box.tsx      | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 apps/extension/src/pages/sign/components/keystone-usb-box.tsx

diff --git a/apps/extension/src/pages/sign/components/keystone-usb-box.tsx b/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
new file mode 100644
index 0000000000..838bd6d677
--- /dev/null
+++ b/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
@@ -0,0 +1,48 @@
+import React, { FunctionComponent } from "react";
+import { VerticalCollapseTransition } from "../../../components/transition/vertical-collapse";
+import { Gutter } from "../../../components/gutter";
+import { GuideBox } from "../../../components/guide-box";
+import { useIntl } from "react-intl";
+
+export const KeystoneUSBBox: FunctionComponent<{
+  isKeystoneInteracting: boolean;
+  KeystoneInteractingError: Error | undefined;
+}> = ({ isKeystoneInteracting, KeystoneInteractingError }) => {
+  const intl = useIntl();
+  return (
+    <VerticalCollapseTransition
+      collapsed={!isKeystoneInteracting && KeystoneInteractingError == null}
+      transitionAlign="bottom"
+    >
+      <Gutter size="0.75rem" />
+      {(() => {
+        if (KeystoneInteractingError) {
+          return (
+            <GuideBox
+              color="warning"
+              title={intl.formatMessage({
+                id: "page.sign.components.ledger-guide.box.unknown-error-title",
+              })}
+              paragraph={
+                KeystoneInteractingError.message ||
+                KeystoneInteractingError.toString()
+              }
+            />
+          );
+        }
+
+        return (
+          <GuideBox
+            color="default"
+            title={intl.formatMessage({
+              id: "page.sign.components.ledger-guide.box.sign-on-ledger-title",
+            })}
+            paragraph={intl.formatMessage({
+              id: "page.sign.components.ledger-guide.box.sign-on-ledger-paragraph",
+            })}
+          />
+        );
+      })()}
+    </VerticalCollapseTransition>
+  );
+};

From 41e1d74bc5b8966ddf215a794270d57705c273d0 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Thu, 19 Sep 2024 16:13:33 +0800
Subject: [PATCH 06/21] add the keystone usb signing for ethereum tx

---
 .../src/pages/sign/ethereum/view.tsx          | 56 ++++++++++++-------
 .../src/pages/sign/utils/handle-eth-sign.ts   | 41 ++++++++++++--
 2 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/apps/extension/src/pages/sign/ethereum/view.tsx b/apps/extension/src/pages/sign/ethereum/view.tsx
index ef9002a555..f8044a1840 100644
--- a/apps/extension/src/pages/sign/ethereum/view.tsx
+++ b/apps/extension/src/pages/sign/ethereum/view.tsx
@@ -19,6 +19,7 @@ import { KeplrError } from "@keplr-wallet/router";
 import { ErrModuleLedgerSign } from "../utils/ledger-types";
 import { Buffer } from "buffer/";
 import { LedgerGuideBox } from "../components/ledger-guide-box";
+import { KeystoneUSBBox } from "../../components/keystone-usb-box";
 import { EthSignType } from "@keplr-wallet/types";
 import {
   handleEthereumPreSignByKeystone,
@@ -309,6 +310,9 @@ export const EthereumSigningView: FunctionComponent<{
     Error | undefined
   >(undefined);
 
+  const isKeystonUSB =
+    interactionData.data.keyInsensitive["connectionType"] === "USB";
+
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
   const [keystoneUR, setKeystoneUR] = useState<KeystoneUR>();
   const keystoneScanResolve = useRef<(ur: KeystoneUR) => void>();
@@ -355,7 +359,9 @@ export const EthereumSigningView: FunctionComponent<{
         isLoading:
           signEthereumInteractionStore.isObsoleteInteraction(
             interactionData.id
-          ) || isLedgerInteracting,
+          ) ||
+          isLedgerInteracting ||
+          isKeystoneInteracting,
         onClick: async () => {
           try {
             let signature;
@@ -371,6 +377,7 @@ export const EthereumSigningView: FunctionComponent<{
               );
             } else if (interactionData.data.keyType === "keystone") {
               setIsKeystoneInteracting(true);
+              setKeystoneInteractingError(undefined);
               signature = await handleEthereumPreSignByKeystone(
                 interactionData,
                 Buffer.from(signingDataText),
@@ -434,6 +441,7 @@ export const EthereumSigningView: FunctionComponent<{
             }
           } finally {
             setIsLedgerInteracting(false);
+            setIsKeystoneInteracting(false);
           }
         },
       }}
@@ -687,27 +695,35 @@ export const EthereumSigningView: FunctionComponent<{
           ledgerInteractingError={ledgerInteractingError}
           isInternal={interactionData.isInternal}
         />
+        {isKeystonUSB && (
+          <KeystoneUSBBox
+            isKeystoneInteracting={isKeystoneInteracting}
+            keystoneInteractingError={keystoneInteractingError}
+          />
+        )}
       </Box>
-      <KeystoneSign
-        ur={keystoneUR}
-        isOpen={isKeystoneInteracting}
-        close={() => {
-          setIsKeystoneInteracting(false);
-        }}
-        onScan={(ur) => {
-          if (keystoneScanResolve.current === undefined) {
-            throw new Error("Keystone Scan Error");
-          }
-          keystoneScanResolve.current(ur);
-        }}
-        error={keystoneInteractingError}
-        onCloseError={() => {
-          if (keystoneInteractingError) {
+      {!isKeystonUSB && (
+        <KeystoneSign
+          ur={keystoneUR}
+          isOpen={isKeystoneInteracting}
+          close={() => {
             setIsKeystoneInteracting(false);
-          }
-          setKeystoneInteractingError(undefined);
-        }}
-      />
+          }}
+          onScan={(ur) => {
+            if (keystoneScanResolve.current === undefined) {
+              throw new Error("Keystone Scan Error");
+            }
+            keystoneScanResolve.current(ur);
+          }}
+          error={keystoneInteractingError}
+          onCloseError={() => {
+            if (keystoneInteractingError) {
+              setIsKeystoneInteracting(false);
+            }
+            setKeystoneInteractingError(undefined);
+          }}
+        />
+      )}
     </HeaderLayout>
   );
 });
diff --git a/apps/extension/src/pages/sign/utils/handle-eth-sign.ts b/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
index eddd9dbf51..e674e1f8cc 100644
--- a/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
+++ b/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
@@ -2,6 +2,8 @@ import { SignEthereumInteractionStore } from "@keplr-wallet/stores-core";
 import { EthSignType } from "@keplr-wallet/types";
 import Transport from "@ledgerhq/hw-transport";
 import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
+import { UREncoder } from "@keystonehq/keystone-sdk";
+import Base from "@keystonehq/hw-app-base";
 import { KeplrError } from "@keplr-wallet/router";
 import {
   ErrCodeDeviceLocked,
@@ -28,9 +30,12 @@ import {
   encodeEthMessage,
   getEthDataTypeFromSignType,
   getPathFromPubKey,
+  ErrModuleKeystoneSign,
+  ErrKeystoneUSBCommunication,
 } from "./keystone";
 import KeystoneSDK, { UR, utils } from "@keystonehq/keystone-sdk";
 import { EthermintChainIdHelper } from "@keplr-wallet/cosmos";
+import { createKeystoneTransport } from "../../../utils/keystone";
 
 export interface LedgerOptions {
   useWebHID: boolean;
@@ -130,13 +135,37 @@ export const handleEthereumPreSignByKeystone = async (
     chainId: evmChainId,
     address,
   });
-  await options.displayQRCode({
-    type: ur.type,
-    cbor: ur.cbor.toString("hex"),
-  });
-  const scanResult = await options.scanQRCode();
+
+  const isUSB = interactionData.data.keyInsensitive["connectionType"] === "USB";
+
+  let urResult: KeystoneUR;
+  if (isUSB) {
+    try {
+      const transport = await createKeystoneTransport();
+      const URString = new UREncoder(ur, Infinity).nextPart().toUpperCase();
+      const baseApp = new Base(transport as any);
+      const response = await baseApp.sendURRequest(URString);
+      urResult = {
+        type: response.type,
+        cbor: response.cbor.toString("hex"),
+      } as KeystoneUR;
+    } catch (e) {
+      throw new KeplrError(
+        ErrModuleKeystoneSign,
+        ErrKeystoneUSBCommunication,
+        "Keystone USB communication error, Please try again."
+      );
+    }
+  } else {
+    await options.displayQRCode({
+      type: ur.type,
+      cbor: ur.cbor.toString("hex"),
+    });
+    urResult = await options.scanQRCode();
+  }
+
   const signResult = keystoneSDK.eth.parseSignature(
-    new UR(Buffer.from(scanResult.cbor, "hex"), scanResult.type)
+    new UR(Buffer.from(urResult.cbor, "hex"), urResult.type)
   );
   if (signResult.requestId !== requestId) {
     throw new Error("Invalid request id");

From 02d71ffd0a6028e8edb60b4a6f378689277820ef Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Thu, 19 Sep 2024 16:25:01 +0800
Subject: [PATCH 07/21] add the keystone usb signing for ard36 tx

---
 .../extension/src/pages/sign/cosmos/adr36.tsx | 58 ++++++++++++-------
 .../src/pages/sign/cosmos/tx/view.tsx         |  1 +
 .../src/pages/sign/ethereum/view.tsx          |  1 +
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/apps/extension/src/pages/sign/cosmos/adr36.tsx b/apps/extension/src/pages/sign/cosmos/adr36.tsx
index 888be84607..d6b43ff770 100644
--- a/apps/extension/src/pages/sign/cosmos/adr36.tsx
+++ b/apps/extension/src/pages/sign/cosmos/adr36.tsx
@@ -24,6 +24,7 @@ import { KeyRingService } from "@keplr-wallet/background";
 import { handleExternalInteractionWithNoProceedNext } from "../../../utils";
 import { MessageAdr36Icon } from "../../../components/icon";
 import { ItemLogo } from "../../main/token-detail/msg-items/logo";
+import { KeystoneUSBBox } from "../components/keystone-usb-box";
 
 export const SignCosmosADR36Page: FunctionComponent = observer(() => {
   const { chainStore, signInteractionStore, uiConfigStore } = useStore();
@@ -108,6 +109,11 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
     Error | undefined
   >(undefined);
 
+  const isKeystonUSB =
+    signInteractionStore.waitingData?.data.keyType === "keystone" &&
+    signInteractionStore.waitingData?.data.keyInsensitive["connectionType"] ===
+      "USB";
+
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
   const [keystoneUR, setKeystoneUR] = useState<KeystoneUR>();
   const keystoneScanResolve = useRef<(ur: KeystoneUR) => void>();
@@ -134,7 +140,9 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
         isLoading:
           signInteractionStore.isObsoleteInteraction(
             signInteractionStore.waitingData?.id
-          ) || isLedgerInteracting,
+          ) ||
+          isLedgerInteracting ||
+          isKeystoneInteracting,
         onClick: async () => {
           if (signInteractionStore.waitingData) {
             const signDocWrapper =
@@ -163,6 +171,7 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
               signInteractionStore.waitingData.data.keyType === "keystone"
             ) {
               setIsKeystoneInteracting(true);
+              setKeystoneInteractingError(undefined);
               const isEthSigning = KeyRingService.isEthermintLike(
                 chainStore.getChain(
                   signInteractionStore.waitingData.data.chainId
@@ -220,6 +229,7 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
               }
             } finally {
               setIsLedgerInteracting(false);
+              setIsKeystoneInteracting(false);
             }
           }
         },
@@ -414,27 +424,35 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
             isInternal={signInteractionStore.waitingData.isInternal}
           />
         ) : null}
+        {isKeystonUSB && (
+          <KeystoneUSBBox
+            isKeystoneInteracting={isKeystoneInteracting}
+            KeystoneInteractingError={keystoneInteractingError}
+          />
+        )}
       </Box>
-      <KeystoneSign
-        ur={keystoneUR}
-        isOpen={isKeystoneInteracting}
-        close={() => {
-          setIsKeystoneInteracting(false);
-        }}
-        onScan={(ur) => {
-          if (keystoneScanResolve.current === undefined) {
-            throw new Error("Keystone Scan Error");
-          }
-          keystoneScanResolve.current(ur);
-        }}
-        error={keystoneInteractingError}
-        onCloseError={() => {
-          if (keystoneInteractingError) {
+      {!isKeystonUSB && (
+        <KeystoneSign
+          ur={keystoneUR}
+          isOpen={isKeystoneInteracting}
+          close={() => {
             setIsKeystoneInteracting(false);
-          }
-          setKeystoneInteractingError(undefined);
-        }}
-      />
+          }}
+          onScan={(ur) => {
+            if (keystoneScanResolve.current === undefined) {
+              throw new Error("Keystone Scan Error");
+            }
+            keystoneScanResolve.current(ur);
+          }}
+          error={keystoneInteractingError}
+          onCloseError={() => {
+            if (keystoneInteractingError) {
+              setIsKeystoneInteracting(false);
+            }
+            setKeystoneInteractingError(undefined);
+          }}
+        />
+      )}
     </HeaderLayout>
   );
 });
diff --git a/apps/extension/src/pages/sign/cosmos/tx/view.tsx b/apps/extension/src/pages/sign/cosmos/tx/view.tsx
index 61a89f2da0..9a4f701bef 100644
--- a/apps/extension/src/pages/sign/cosmos/tx/view.tsx
+++ b/apps/extension/src/pages/sign/cosmos/tx/view.tsx
@@ -340,6 +340,7 @@ export const CosmosTxView: FunctionComponent<{
   >(undefined);
 
   const isKeystonUSB =
+    interactionData.data.keyType === "keystone" &&
     interactionData.data.keyInsensitive["connectionType"] === "USB";
 
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
diff --git a/apps/extension/src/pages/sign/ethereum/view.tsx b/apps/extension/src/pages/sign/ethereum/view.tsx
index f8044a1840..aa24399aa5 100644
--- a/apps/extension/src/pages/sign/ethereum/view.tsx
+++ b/apps/extension/src/pages/sign/ethereum/view.tsx
@@ -311,6 +311,7 @@ export const EthereumSigningView: FunctionComponent<{
   >(undefined);
 
   const isKeystonUSB =
+    interactionData.data.keyType === "keystone" &&
     interactionData.data.keyInsensitive["connectionType"] === "USB";
 
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);

From 93a412b9a249cf5e64a29aaa1db311b52c448049 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Tue, 24 Sep 2024 13:54:23 +0800
Subject: [PATCH 08/21] update the text of keystone usb

---
 apps/extension/src/languages/en.json          |   7 +-
 .../pages/register/connect-keystone/usb.tsx   | 130 +++---------------
 .../src/pages/sign/ethereum/view.tsx          |   4 +-
 3 files changed, 28 insertions(+), 113 deletions(-)

diff --git a/apps/extension/src/languages/en.json b/apps/extension/src/languages/en.json
index deb25e968b..6b9872f8d6 100644
--- a/apps/extension/src/languages/en.json
+++ b/apps/extension/src/languages/en.json
@@ -132,10 +132,7 @@
   "pages.register.connect-ledger.use-hid-confirm-title": "Unable to use Web HID",
   "pages.register.connect-ledger.use-hid-confirm-paragraph": "Please enable ‘experimental web platform features’ to use Web HID",
 
-  "pages.register.connect-keystone.title": "Please Connect Your Hardware Wallet",
   "pages.register.connect-keystone.paragraph": "Please unlock your Keystone device and connect it to your computer via USB.",
-  "pages.register.connect-keystone.connect-keystone-step-paragraph": "Connect and unlock your Keystone.",
-  "pages.register.connect-keystone.fetch-address-paragraph": "Fetching addresses from your Keystone device.",
   "pages.register.connect-keystone.step-text": "Step {num}",
   "pages.register.connect-keystone.step-1": "Tap “<span>Connect Software Wallet</span>” at the bottom left corner on the Keystone device.",
   "pages.register.connect-keystone.step-2": "Select “<span>Keplr Wallet</span>”.",
@@ -152,6 +149,10 @@
   "pages.register.connect-keystone.tutorial": "Tutorial",
   "pages.register.connect-keystone.unsupported": "Unsupported",
 
+  "pages.register.connect-keystone.usb.title": "Please Connect Your Hardware Wallet",
+  "pages.register.connect-keystone.usb.step-1": "Connect and unlock your Keystone.",
+  "pages.register.connect-keystone.usb.step-2": "Ensure your Keystone 3 Pro is on the homepage.",
+
   "pages.register.enable-chains.title": "Select Chains",
   "pages.register.enable-chains.paragraph": "Don’t worry, you can change your selections anytime in the Manage Chain Visibility in the sidebar menu.",
   "pages.register.enable-chains.search-input-placeholder": "Search networks",
diff --git a/apps/extension/src/pages/register/connect-keystone/usb.tsx b/apps/extension/src/pages/register/connect-keystone/usb.tsx
index 673d56160c..c6701e2cb1 100644
--- a/apps/extension/src/pages/register/connect-keystone/usb.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/usb.tsx
@@ -23,7 +23,6 @@ import KeystoneSDK, {
   DerivationAlgorithm,
 } from "@keystonehq/keystone-sdk";
 import { KeystoneIcon } from "../../../components/icon/keystone";
-import { IconProps } from "../../../components/icon/types";
 
 type Step = "unknown" | "connected" | "app";
 
@@ -71,13 +70,9 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
       header.setHeader({
         mode: "step",
         title: intl.formatMessage({
-          id: "pages.register.connect-keystone.title",
+          id: "pages.register.connect-keystone.usb.title",
         }),
-        paragraphs: [
-          intl.formatMessage({
-            id: "pages.register.connect-keystone.paragraph",
-          }),
-        ],
+        paragraphs: [],
         stepCurrent: stepPrevious + 1,
         stepTotal: stepTotal,
       });
@@ -185,7 +180,7 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
         <StepView
           step={1}
           paragraph={intl.formatMessage({
-            id: "pages.register.connect-keystone.connect-keystone-step-paragraph",
+            id: "pages.register.connect-keystone.usb.step-1",
           })}
           icon={
             <Box style={{ opacity: step !== "unknown" ? 0.5 : 1 }}>
@@ -198,11 +193,11 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
         <StepView
           step={2}
           paragraph={intl.formatMessage({
-            id: "pages.register.connect-keystone.fetch-address-paragraph",
+            id: "pages.register.connect-keystone.usb.step-2",
           })}
           icon={
             <Box style={{ opacity: step !== "connected" ? 0.5 : 1 }}>
-              <KeystoneConnectIcon width={32} height={27} />
+              <CosmosIcon />
             </Box>
           }
           focused={step === "connected"}
@@ -320,109 +315,28 @@ const CheckIcon: FunctionComponent<{
   );
 };
 
-const KeystoneConnectIcon: FunctionComponent<IconProps> = ({
-  width,
-  height,
-}) => {
+const CosmosIcon: FunctionComponent = () => {
   return (
-    <svg width={width} height={height} viewBox="0 0 320 270" fill="none">
+    <svg
+      width="auto"
+      height="2rem"
+      viewBox="0 0 80 81"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect x="8.5" y="9" width="62" height="62" rx="15.6962" fill="#424247" />
       <circle
-        cx="163.077"
-        cy="134.769"
-        r="129.077"
-        stroke="#505766"
-        strokeOpacity="0.6"
-        strokeWidth="4"
-      />
-      <path d="M118 72H206V197H118V72Z" stroke="#787A8D" strokeWidth="4" />
-      <path
-        d="M125 79H199V183H125V79Z"
-        fill="url(#paint0_linear_1099_541)"
-        fillOpacity="0.4"
-      />
-      <path
-        d="M125 79H199V183H125V79Z"
-        fill="url(#paint1_radial_1099_541)"
-        fillOpacity="0.2"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M131 93H149.5V98H131V93ZM131 102H178V107H131V102ZM154 111H131V116H154V111Z"
-        fill="#787A8D"
-      />
-      <rect
-        x="2"
-        y="13.0771"
-        width="94.4615"
-        height="94.4615"
-        rx="47.2308"
-        fill="#040A18"
-      />
-      <rect
-        x="2"
-        y="13.0771"
-        width="94.4615"
-        height="94.4615"
-        rx="47.2308"
-        stroke="#4F4F59"
-        strokeWidth="4"
-      />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M58.4613 48.0008L49.2306 36.7188L39.9998 48.0008H47.1793V75.0331L39.9998 70.4645V66.0356C41.811 65.2443 43.0767 63.437 43.0767 61.3341C43.0767 58.5019 40.7807 56.2059 37.9485 56.2059C35.1163 56.2059 32.8203 58.5019 32.8203 61.3341C32.8203 63.437 34.0861 65.2443 35.8972 66.0356V71.5905V72.7166L36.8473 73.3212L47.1793 79.8959V80.1376V82.1888H51.2819V80.1376V75.7935L61.6139 69.2186L62.5639 68.614V67.488V61.3341H65.128V52.1034H55.8972V61.3341H58.4613V66.3619L51.2819 70.9307V48.0008H58.4613Z"
-        fill="white"
-        fillOpacity="0.9"
-      />
-      <rect
-        x="223.538"
-        y="160.77"
-        width="94.4615"
-        height="94.4615"
-        rx="47.2308"
-        fill="#040A18"
-      />
-      <rect
-        x="223.538"
-        y="160.77"
-        width="94.4615"
-        height="94.4615"
-        rx="47.2308"
-        stroke="#4F4F59"
-        strokeWidth="4"
+        cx="39.8219"
+        cy="40.321"
+        r="12.1578"
+        stroke="#F6F6F9"
+        strokeWidth="4.04115"
       />
       <path
-        d="M265.299 224.41H254.358V216.205M276.239 224.41H287.179V216.205M276.239 191.59H287.179V199.795M265.299 191.59H254.358V199.795"
-        stroke="white"
-        strokeOpacity="0.9"
-        strokeWidth="4.10256"
+        d="M54.0003 25.498L24.999 54.4993"
+        stroke="#F6F6F9"
+        strokeWidth="4.04115"
       />
-      <path d="M252.308 208H289.231" stroke="white" strokeWidth="4.10256" />
-      <defs>
-        <linearGradient
-          id="paint0_linear_1099_541"
-          x1="125"
-          y1="79"
-          x2="138.205"
-          y2="183.585"
-          gradientUnits="userSpaceOnUse"
-        >
-          <stop stopColor="white" stopOpacity="0.6" />
-          <stop offset="1" stopColor="white" stopOpacity="0.1" />
-        </linearGradient>
-        <radialGradient
-          id="paint1_radial_1099_541"
-          cx="0"
-          cy="0"
-          r="1"
-          gradientUnits="userSpaceOnUse"
-          gradientTransform="translate(125 79) rotate(52.6346) scale(60.9659 64.3597)"
-        >
-          <stop stopColor="white" />
-          <stop offset="1" stopColor="white" stopOpacity="0.2" />
-        </radialGradient>
-      </defs>
     </svg>
   );
 };
diff --git a/apps/extension/src/pages/sign/ethereum/view.tsx b/apps/extension/src/pages/sign/ethereum/view.tsx
index aa24399aa5..8db7762ec9 100644
--- a/apps/extension/src/pages/sign/ethereum/view.tsx
+++ b/apps/extension/src/pages/sign/ethereum/view.tsx
@@ -19,7 +19,7 @@ import { KeplrError } from "@keplr-wallet/router";
 import { ErrModuleLedgerSign } from "../utils/ledger-types";
 import { Buffer } from "buffer/";
 import { LedgerGuideBox } from "../components/ledger-guide-box";
-import { KeystoneUSBBox } from "../../components/keystone-usb-box";
+import { KeystoneUSBBox } from "../components/keystone-usb-box";
 import { EthSignType } from "@keplr-wallet/types";
 import {
   handleEthereumPreSignByKeystone,
@@ -699,7 +699,7 @@ export const EthereumSigningView: FunctionComponent<{
         {isKeystonUSB && (
           <KeystoneUSBBox
             isKeystoneInteracting={isKeystoneInteracting}
-            keystoneInteractingError={keystoneInteractingError}
+            KeystoneInteractingError={keystoneInteractingError}
           />
         )}
       </Box>

From a725102c1ba396d8e444c696acbb39632e6ef3d6 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Tue, 24 Sep 2024 14:04:12 +0800
Subject: [PATCH 09/21] update the text on keystone usb signing

---
 apps/extension/src/languages/en.json                        | 4 ++++
 .../src/pages/sign/components/keystone-usb-box.tsx          | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/extension/src/languages/en.json b/apps/extension/src/languages/en.json
index 6b9872f8d6..05efb50a2b 100644
--- a/apps/extension/src/languages/en.json
+++ b/apps/extension/src/languages/en.json
@@ -509,6 +509,10 @@
   "page.sign.keystone.invalid-qrcode": "Invalid QR code",
   "page.sign.keystone.select-valid-qrcode": "Please ensure you have selected a valid QR code from your Keystone device.",
 
+  "page.sign.keystone.usb.box.unknown-error-title": "Unknown error",
+  "page.sign.keystone.usb.box.sign-on-keystone-title": "Sign on Keystone",
+  "page.sign.keystone.usb.box.sign-on-keystone-paragraph": "To proceed, please review and approve the transaction on your Keystone device.",
+
   "page.send.select-asset.title": "Select Asset",
   "page.send.select-asset.search-placeholder": "Search for asset or chain",
   "page.send.select-asset.hide-ibc-token": "Hide IBC token",
diff --git a/apps/extension/src/pages/sign/components/keystone-usb-box.tsx b/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
index 838bd6d677..31b662e39c 100644
--- a/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
+++ b/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
@@ -21,7 +21,7 @@ export const KeystoneUSBBox: FunctionComponent<{
             <GuideBox
               color="warning"
               title={intl.formatMessage({
-                id: "page.sign.components.ledger-guide.box.unknown-error-title",
+                id: "page.sign.keystone.usb.box.unknown-error-title",
               })}
               paragraph={
                 KeystoneInteractingError.message ||
@@ -35,10 +35,10 @@ export const KeystoneUSBBox: FunctionComponent<{
           <GuideBox
             color="default"
             title={intl.formatMessage({
-              id: "page.sign.components.ledger-guide.box.sign-on-ledger-title",
+              id: "page.sign.keystone.usb.box.sign-on-keystone-title",
             })}
             paragraph={intl.formatMessage({
-              id: "page.sign.components.ledger-guide.box.sign-on-ledger-paragraph",
+              id: "page.sign.keystone.usb.box.sign-on-keystone-paragraph",
             })}
           />
         );

From 5962ee9bcd5d5564f52102552fe39f4fbbea4937 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Tue, 24 Sep 2024 14:12:46 +0800
Subject: [PATCH 10/21] add the text for korean translation

---
 apps/extension/src/languages/ko.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/extension/src/languages/ko.json b/apps/extension/src/languages/ko.json
index f96a01e63f..66c57d0f86 100644
--- a/apps/extension/src/languages/ko.json
+++ b/apps/extension/src/languages/ko.json
@@ -145,6 +145,10 @@
   "pages.register.connect-keystone.tutorial": "튜토리얼",
   "pages.register.connect-keystone.unsupported": "미지원",
 
+  "pages.register.connect-keystone.usb.title": "하드웨어 지갑을 연결해 주세요.",
+  "pages.register.connect-keystone.usb.step-1": "키스톤을 연결하고 잠금을 해제하세요.",
+  "pages.register.connect-keystone.usb.step-2": "귀하의 Keystone 3 Pro가 홈페이지에 있도록 하십시오.",
+
   "pages.register.enable-chains.title": "체인 선택하기",
   "pages.register.enable-chains.paragraph": "걱정마세요! 언제든지 사이드바 메뉴에 있는 ‘체인 표시’를 방문해서 설정을 변경할 수 있습니다.",
   "pages.register.enable-chains.search-input-placeholder": "네트워크 검색하기",
@@ -484,6 +488,10 @@
   "page.sign.keystone.invalid-qrcode": "QR 코드가 유효하지 않습니다",
   "page.sign.keystone.select-valid-qrcode": "키스톤 장치에서 유효한 QR 코드를 선택했는지 확인해주세요.",
 
+  "page.sign.keystone.usb.box.unknown-error-title": "알 수 없는 오류",
+  "page.sign.keystone.usb.box.sign-on-keystone-title": "키스톤에 있는 표지판",
+  "page.sign.keystone.usb.box.sign-on-keystone-paragraph": "진행하려면, 귀하의 Keystone 기기에서 거래를 검토하고 승인해 주시기 바랍니다.",
+
   "page.send.select-asset.title": "자산 선택",
   "page.send.select-asset.search-placeholder": "자산이나 체인 이름 검색",
   "page.send.select-asset.hide-ibc-token": "IBC 토큰 숨기기",

From 21ea409e98ee11ad72b3a4f53c436fb6a3382673 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Tue, 24 Sep 2024 14:21:17 +0800
Subject: [PATCH 11/21] add the chinese translation for keystone usb

---
 apps/extension/src/languages/zh-cn.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/extension/src/languages/zh-cn.json b/apps/extension/src/languages/zh-cn.json
index ec49dec8c2..42be9b84de 100644
--- a/apps/extension/src/languages/zh-cn.json
+++ b/apps/extension/src/languages/zh-cn.json
@@ -139,6 +139,10 @@
   "pages.register.connect-keystone.tutorial": "教程",
   "pages.register.connect-keystone.unsupported": "暂不支持",
 
+  "pages.register.connect-keystone.usb.title": "请连接您的硬件钱包",
+  "pages.register.connect-keystone.usb.step-1": "连接并解锁您的Keystone.",
+  "pages.register.connect-keystone.usb.step-2": "确保你的 Keystone 3 Pro 在主页上。",
+
   "pages.register.enable-chains.title": "选择链",
   "pages.register.enable-chains.paragraph": "不用担心，你可以随时在侧边栏菜单中的“管理链可见性”中更改你的选择。",
   "pages.register.enable-chains.search-input-placeholder": "搜索网络",
@@ -473,6 +477,10 @@
   "page.sign.keystone.invalid-qrcode": "无效的二维码",
   "page.sign.keystone.select-valid-qrcode": "请确保你从Keystone设备中选择了正确的二维码。",
 
+  "page.sign.keystone.usb.box.unknown-error-title": "未知错误",
+  "page.sign.keystone.usb.box.sign-on-keystone-title": "Keystone 签名",
+  "page.sign.keystone.usb.box.sign-on-keystone-paragraph": "要继续，请在你的Keystone设备上查看并确认交易。",
+
   "page.send.select-asset.title": "选择资产",
   "page.send.select-asset.search-placeholder": "搜索资产或链",
   "page.send.select-asset.hide-ibc-token": "隐藏IBC币种",

From 3e66709ad23c40d50ab2eea394980158a078bcb1 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Tue, 24 Sep 2024 14:21:48 +0800
Subject: [PATCH 12/21] add the utils function for keystone

---
 apps/extension/src/utils/keystone.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 apps/extension/src/utils/keystone.ts

diff --git a/apps/extension/src/utils/keystone.ts b/apps/extension/src/utils/keystone.ts
new file mode 100644
index 0000000000..7d49a60ccd
--- /dev/null
+++ b/apps/extension/src/utils/keystone.ts
@@ -0,0 +1,20 @@
+import {
+  TransportWebUSB,
+  getKeystoneDevices,
+} from "@keystonehq/hw-transport-webusb";
+
+export async function createKeystoneTransport() {
+  if ((await getKeystoneDevices()).length <= 0) {
+    try {
+      await TransportWebUSB.requestPermission();
+    } catch (e) {
+      throw new Error("USB_PERMISSIONS_NOT_AVAILABLE");
+    }
+  }
+
+  const transport = await TransportWebUSB.connect({
+    timeout: 100000,
+  });
+  await transport.close();
+  return transport;
+}

From 2021ebf869709f2e23ee266d18941efdeacc855c Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Wed, 25 Sep 2024 13:24:45 +0800
Subject: [PATCH 13/21] update the keystone webusb dependency

---
 apps/extension/package.json |  2 +-
 yarn.lock                   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/extension/package.json b/apps/extension/package.json
index fc8dd288a0..c483776ec9 100644
--- a/apps/extension/package.json
+++ b/apps/extension/package.json
@@ -52,7 +52,7 @@
     "@keystonehq/animated-qr": "^0.8.6",
     "@keystonehq/hw-app-base": "0.1.1",
     "@keystonehq/hw-app-eth": "^0.4.4",
-    "@keystonehq/hw-transport-webusb": "^0.4.0-beta.0",
+    "@keystonehq/hw-transport-webusb": "^0.4.0",
     "@keystonehq/keystone-sdk": "^0.2.3",
     "@ledgerhq/devices": "^6.20.0",
     "@react-spring/web": "^9.6.1",
diff --git a/yarn.lock b/yarn.lock
index 0024cc5f3a..46de87f5fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8776,7 +8776,7 @@ __metadata:
     "@keystonehq/animated-qr": ^0.8.6
     "@keystonehq/hw-app-base": 0.1.1
     "@keystonehq/hw-app-eth": ^0.4.4
-    "@keystonehq/hw-transport-webusb": ^0.4.0-beta.0
+    "@keystonehq/hw-transport-webusb": ^0.4.0
     "@keystonehq/keystone-sdk": ^0.2.3
     "@ledgerhq/devices": ^6.20.0
     "@react-spring/web": ^9.6.1
@@ -9550,6 +9550,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@keystonehq/hw-transport-webusb@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@keystonehq/hw-transport-webusb@npm:0.4.0"
+  dependencies:
+    "@keystonehq/hw-transport-error": ^0.0.2
+    buffer: ^6.0.3
+  checksum: 7c56d7b9b73596306be50aae6b5661905a88fb018385b6074c0f18a04efbf5871f7fe93b957c6fe8f966f7c829ff085df444c9fbd23967c0ef2df4a7f9f7e4ae
+  languageName: node
+  linkType: hard
+
 "@keystonehq/hw-transport-webusb@npm:^0.4.0-beta.0":
   version: 0.4.0-beta.0
   resolution: "@keystonehq/hw-transport-webusb@npm:0.4.0-beta.0"

From 35c79b6e6d45df66829a789612d67a3eda96551c Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Wed, 25 Sep 2024 14:07:12 +0800
Subject: [PATCH 14/21] clear the dependency and lock version

---
 apps/extension/package.json |   3 +-
 yarn.lock                   | 151 +-----------------------------------
 2 files changed, 5 insertions(+), 149 deletions(-)

diff --git a/apps/extension/package.json b/apps/extension/package.json
index c483776ec9..484ea6e1b4 100644
--- a/apps/extension/package.json
+++ b/apps/extension/package.json
@@ -51,8 +51,7 @@
     "@keplr-wallet/unit": "0.12.125",
     "@keystonehq/animated-qr": "^0.8.6",
     "@keystonehq/hw-app-base": "0.1.1",
-    "@keystonehq/hw-app-eth": "^0.4.4",
-    "@keystonehq/hw-transport-webusb": "^0.4.0",
+    "@keystonehq/hw-transport-webusb": "0.4.0",
     "@keystonehq/keystone-sdk": "^0.2.3",
     "@ledgerhq/devices": "^6.20.0",
     "@react-spring/web": "^9.6.1",
diff --git a/yarn.lock b/yarn.lock
index 46de87f5fa..01d9b9e600 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6538,16 +6538,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/rlp@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@ethereumjs/rlp@npm:5.0.2"
-  bin:
-    rlp: bin/rlp.cjs
-  checksum: b569061ddb1f4cf56a82f7a677c735ba37f9e94e2bbaf567404beb9e2da7aa1f595e72fc12a17c61f7aec67fd5448443efe542967c685a2fe0ffc435793dcbab
-  languageName: node
-  linkType: hard
-
-"@ethereumjs/tx@npm:^3.3.2, @ethereumjs/tx@npm:^3.5.2":
+"@ethereumjs/tx@npm:^3.5.2":
   version: 3.5.2
   resolution: "@ethereumjs/tx@npm:3.5.2"
   dependencies:
@@ -6568,16 +6559,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^9.0.3":
-  version: 9.1.0
-  resolution: "@ethereumjs/util@npm:9.1.0"
-  dependencies:
-    "@ethereumjs/rlp": ^5.0.2
-    ethereum-cryptography: ^2.2.1
-  checksum: 594e009c3001ca1ca658b4ded01b38e72f5dd5dd76389efd90cb020de099176a3327685557df268161ac3144333cfe8abaae68cda8ae035d9cc82409d386d79a
-  languageName: node
-  linkType: hard
-
 "@ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.7.0":
   version: 5.7.0
   resolution: "@ethersproject/abi@npm:5.7.0"
@@ -8775,8 +8756,7 @@ __metadata:
     "@keplr-wallet/unit": 0.12.125
     "@keystonehq/animated-qr": ^0.8.6
     "@keystonehq/hw-app-base": 0.1.1
-    "@keystonehq/hw-app-eth": ^0.4.4
-    "@keystonehq/hw-transport-webusb": ^0.4.0
+    "@keystonehq/hw-transport-webusb": 0.4.0
     "@keystonehq/keystone-sdk": ^0.2.3
     "@ledgerhq/devices": ^6.20.0
     "@react-spring/web": ^9.6.1
@@ -9382,18 +9362,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/bc-ur-registry-eth@npm:^0.8.1-alpha.0":
-  version: 0.8.1-alpha.0
-  resolution: "@keystonehq/bc-ur-registry-eth@npm:0.8.1-alpha.0"
-  dependencies:
-    "@keystonehq/bc-ur-registry": ^0.5.0-alpha.4
-    ethereumjs-util: ^7.0.8
-    hdkey: ^2.0.1
-    uuid: ^8.3.2
-  checksum: e7bd081a17a3f5d688d49ef96a44025c2262dd80c31813857b659ab2879659b41f9e8830832047da052eaeedb10de27dd4f6dba64e378e6054f7611f04b876d8
-  languageName: node
-  linkType: hard
-
 "@keystonehq/bc-ur-registry-evm@npm:^0.5.2":
   version: 0.5.2
   resolution: "@keystonehq/bc-ur-registry-evm@npm:0.5.2"
@@ -9479,7 +9447,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/bc-ur-registry@npm:^0.5.0-alpha.4, @keystonehq/bc-ur-registry@npm:^0.5.4, @keystonehq/bc-ur-registry@npm:^0.5.5":
+"@keystonehq/bc-ur-registry@npm:^0.5.4, @keystonehq/bc-ur-registry@npm:^0.5.5":
   version: 0.5.5
   resolution: "@keystonehq/bc-ur-registry@npm:0.5.5"
   dependencies:
@@ -9514,25 +9482,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/hw-app-eth@npm:^0.4.4":
-  version: 0.4.4
-  resolution: "@keystonehq/hw-app-eth@npm:0.4.4"
-  dependencies:
-    "@ethereumjs/tx": ^3.3.2
-    "@ethereumjs/util": ^9.0.3
-    "@keystonehq/bc-ur-registry": 0.7.0
-    "@keystonehq/bc-ur-registry-eth": ^0.8.1-alpha.0
-    "@keystonehq/hw-transport-error": ^0.0.2
-    "@keystonehq/hw-transport-webusb": ^0.3.2
-    "@ngraveio/bc-ur": ^1.1.6
-    buffer: ^6.0.3
-    elliptic: ^6.5.7
-    rlp: ^2.2.6
-    uuid: ^8.3.2
-  checksum: c795021dc05bcc70c082f260ca7bc1d98c4bcf6711796f5afd50fb674cbcdf89c78151ebbd1ff9807175ecff8908e7c6a8ec5fe20d82769fae91464dce2f28d0
-  languageName: node
-  linkType: hard
-
 "@keystonehq/hw-transport-error@npm:^0.0.2":
   version: 0.0.2
   resolution: "@keystonehq/hw-transport-error@npm:0.0.2"
@@ -9540,17 +9489,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/hw-transport-webusb@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@keystonehq/hw-transport-webusb@npm:0.3.3"
-  dependencies:
-    "@keystonehq/hw-transport-error": ^0.0.2
-    buffer: ^6.0.3
-  checksum: 2212d50cb5d6b59c41ab8797688af149a309adfc17f3010beab1f976f47aa3a36770049513c31854b34b683e54a8b40521f674bb676f02a5624f6f15404f21df
-  languageName: node
-  linkType: hard
-
-"@keystonehq/hw-transport-webusb@npm:^0.4.0":
+"@keystonehq/hw-transport-webusb@npm:0.4.0":
   version: 0.4.0
   resolution: "@keystonehq/hw-transport-webusb@npm:0.4.0"
   dependencies:
@@ -10624,15 +10563,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/curves@npm:1.4.2, @noble/curves@npm:~1.4.0":
-  version: 1.4.2
-  resolution: "@noble/curves@npm:1.4.2"
-  dependencies:
-    "@noble/hashes": 1.4.0
-  checksum: c475a83c4263e2c970eaba728895b9b5d67e0ca880651e9c6e3efdc5f6a4f07ceb5b043bf71c399fc80fada0b8706e69d0772bffdd7b9de2483b988973a34cba
-  languageName: node
-  linkType: hard
-
 "@noble/hashes@npm:1.0.0":
   version: 1.0.0
   resolution: "@noble/hashes@npm:1.0.0"
@@ -10647,13 +10577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:1.4.0, @noble/hashes@npm:~1.4.0":
-  version: 1.4.0
-  resolution: "@noble/hashes@npm:1.4.0"
-  checksum: 8ba816ae26c90764b8c42493eea383716396096c5f7ba6bea559993194f49d80a73c081f315f4c367e51bd2d5891700bcdfa816b421d24ab45b41cb03e4f3342
-  languageName: node
-  linkType: hard
-
 "@noble/hashes@npm:^1, @noble/hashes@npm:^1.0.0":
   version: 1.1.3
   resolution: "@noble/hashes@npm:1.1.3"
@@ -12631,13 +12554,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@scure/base@npm:~1.1.6":
-  version: 1.1.8
-  resolution: "@scure/base@npm:1.1.8"
-  checksum: 1fc8a355ba68663c0eb430cf6a2c5ff5af790c347c1ba1953f344e8681ab37e37e2545e495f7f971b0245727d710fea8c1e57d232d0c6c543cbed4965c7596a1
-  languageName: node
-  linkType: hard
-
 "@scure/bip32@npm:1.3.0":
   version: 1.3.0
   resolution: "@scure/bip32@npm:1.3.0"
@@ -12649,17 +12565,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@scure/bip32@npm:1.4.0":
-  version: 1.4.0
-  resolution: "@scure/bip32@npm:1.4.0"
-  dependencies:
-    "@noble/curves": ~1.4.0
-    "@noble/hashes": ~1.4.0
-    "@scure/base": ~1.1.6
-  checksum: eff491651cbf2bea8784936de75af5fc020fc1bbb9bcb26b2cfeefbd1fb2440ebfaf30c0733ca11c0ae1e272a2ef4c3c34ba5c9fb3e1091c3285a4272045b0c6
-  languageName: node
-  linkType: hard
-
 "@scure/bip39@npm:1.2.0":
   version: 1.2.0
   resolution: "@scure/bip39@npm:1.2.0"
@@ -12670,16 +12575,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@scure/bip39@npm:1.3.0":
-  version: 1.3.0
-  resolution: "@scure/bip39@npm:1.3.0"
-  dependencies:
-    "@noble/hashes": ~1.4.0
-    "@scure/base": ~1.1.6
-  checksum: dbb0b27df753eb6c6380010b25cc9a9ea31f9cb08864fc51e69e5880ff7e2b8f85b72caea1f1f28af165e83b72c48dd38617e43fc632779d025b50ba32ea759e
-  languageName: node
-  linkType: hard
-
 "@segment/loosely-validate-event@npm:^2.0.0":
   version: 2.0.0
   resolution: "@segment/loosely-validate-event@npm:2.0.0"
@@ -22211,21 +22106,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elliptic@npm:^6.5.7":
-  version: 6.5.7
-  resolution: "elliptic@npm:6.5.7"
-  dependencies:
-    bn.js: ^4.11.9
-    brorand: ^1.1.0
-    hash.js: ^1.0.0
-    hmac-drbg: ^1.0.1
-    inherits: ^2.0.4
-    minimalistic-assert: ^1.0.1
-    minimalistic-crypto-utils: ^1.0.1
-  checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8
-  languageName: node
-  linkType: hard
-
 "emittery@npm:^0.13.1":
   version: 0.13.1
   resolution: "emittery@npm:0.13.1"
@@ -23572,18 +23452,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethereum-cryptography@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "ethereum-cryptography@npm:2.2.1"
-  dependencies:
-    "@noble/curves": 1.4.2
-    "@noble/hashes": 1.4.0
-    "@scure/bip32": 1.4.0
-    "@scure/bip39": 1.3.0
-  checksum: 1466e4c417b315a6ac67f95088b769fafac8902b495aada3c6375d827e5a7882f9e0eea5f5451600d2250283d9198b8a3d4d996e374e07a80a324e29136f25c6
-  languageName: node
-  linkType: hard
-
 "ethereumjs-util@npm:^7.0.8, ethereumjs-util@npm:^7.1.0, ethereumjs-util@npm:^7.1.5":
   version: 7.1.5
   resolution: "ethereumjs-util@npm:7.1.5"
@@ -38634,17 +38502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rlp@npm:^2.2.6":
-  version: 2.2.7
-  resolution: "rlp@npm:2.2.7"
-  dependencies:
-    bn.js: ^5.2.0
-  bin:
-    rlp: bin/rlp
-  checksum: 3db4dfe5c793f40ac7e0be689a1f75d05e6f2ca0c66189aeb62adab8c436b857ab4420a419251ee60370d41d957a55698fc5e23ab1e1b41715f33217bc4bb558
-  languageName: node
-  linkType: hard
-
 "rn-fetch-blob@npm:0.13.0-beta.2":
   version: 0.13.0-beta.2
   resolution: "rn-fetch-blob@npm:0.13.0-beta.2"

From 9035f0eec6f5b446986cdcb1b088fdc3207c0942 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Thu, 10 Oct 2024 13:38:09 +0800
Subject: [PATCH 15/21] add the missing transation

---
 apps/extension/src/languages/ko.json    | 4 ++++
 apps/extension/src/languages/zh-cn.json | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/apps/extension/src/languages/ko.json b/apps/extension/src/languages/ko.json
index 66c57d0f86..12b103a9d4 100644
--- a/apps/extension/src/languages/ko.json
+++ b/apps/extension/src/languages/ko.json
@@ -105,6 +105,10 @@
   "pages.register.name-password-hardware.connect-to-terra": "테라 앱",
   "pages.register.name-password-hardware.connect-to-secret": "시크릿 앱",
 
+  "pages.register.name-password-hardware.connect-keystone-way": "Keystone를 통해 연결하세요",
+  "pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
+  "pages.register.name-password-hardware.connect-to-keystone-QR": "QR",
+
   "pages.register.recover-mnemonic.title": "기존 지갑 불러오기",
   "pages.register.recover-mnemonic.paragraph-1": "복구 문구를 통해 지갑을 불러올 수 있습니다. 아무 칸이나 선택해서 전체 복구 문구를 붙여 넣어보세요.",
   "pages.register.recover-mnemonic.paragraph-2": "복구 문구의 단어를 올바른 순서로, 정확한 대소문자, 구두점 기호 혹은 공백으로 기입해야만 지갑을 불러올 수 있습니다.",
diff --git a/apps/extension/src/languages/zh-cn.json b/apps/extension/src/languages/zh-cn.json
index 42be9b84de..92ecdbfc2a 100644
--- a/apps/extension/src/languages/zh-cn.json
+++ b/apps/extension/src/languages/zh-cn.json
@@ -99,6 +99,10 @@
   "pages.register.name-password-hardware.connect-to-terra": "Terra应用",
   "pages.register.name-password-hardware.connect-to-secret": "Secret应用",
 
+  "pages.register.name-password-hardware.connect-keystone-way": "选择Keystone连接方式",
+  "pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
+  "pages.register.name-password-hardware.connect-to-keystone-QR": "QR",
+
   "pages.register.recover-mnemonic.title": "导入已有钱包",
   "pages.register.recover-mnemonic.paragraph-1": "输入助记词，或点击任意输入框并粘贴整个助记词。",
   "pages.register.recover-mnemonic.paragraph-2": "按正确的顺序输入助记词，无需大写、标点符号或空格。",

From 6553ce97179626902479c80fdb7ba8f17f6b2262 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Thu, 10 Oct 2024 14:09:56 +0800
Subject: [PATCH 16/21] fix error message issue

---
 .../pages/sign/utils/handle-cosmos-sign.ts    |  7 +++++--
 .../src/pages/sign/utils/handle-eth-sign.ts   |  7 +++++--
 apps/extension/src/utils/keystone.ts          | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts b/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
index 4f7de1bdf5..6d1e6abc1d 100644
--- a/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
+++ b/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
@@ -27,7 +27,10 @@ import {
   KeystoneUR,
   getPathFromPubKey,
 } from "./keystone";
-import { createKeystoneTransport } from "../../../utils/keystone";
+import {
+  createKeystoneTransport,
+  handleKeystoneUSBError,
+} from "../../../utils/keystone";
 import Base from "@keystonehq/hw-app-base";
 import { PlainObject } from "@keplr-wallet/background";
 import { KeplrError } from "@keplr-wallet/router";
@@ -204,7 +207,7 @@ export const handleCosmosPreSign = async (
           throw new KeplrError(
             ErrModuleKeystoneSign,
             ErrKeystoneUSBCommunication,
-            "Keystone USB communication error, Please try again."
+            handleKeystoneUSBError(e)
           );
         }
       } else {
diff --git a/apps/extension/src/pages/sign/utils/handle-eth-sign.ts b/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
index e674e1f8cc..0273b86df4 100644
--- a/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
+++ b/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
@@ -35,7 +35,10 @@ import {
 } from "./keystone";
 import KeystoneSDK, { UR, utils } from "@keystonehq/keystone-sdk";
 import { EthermintChainIdHelper } from "@keplr-wallet/cosmos";
-import { createKeystoneTransport } from "../../../utils/keystone";
+import {
+  createKeystoneTransport,
+  handleKeystoneUSBError,
+} from "../../../utils/keystone";
 
 export interface LedgerOptions {
   useWebHID: boolean;
@@ -153,7 +156,7 @@ export const handleEthereumPreSignByKeystone = async (
       throw new KeplrError(
         ErrModuleKeystoneSign,
         ErrKeystoneUSBCommunication,
-        "Keystone USB communication error, Please try again."
+        handleKeystoneUSBError(e)
       );
     }
   } else {
diff --git a/apps/extension/src/utils/keystone.ts b/apps/extension/src/utils/keystone.ts
index 7d49a60ccd..0ddbfb2923 100644
--- a/apps/extension/src/utils/keystone.ts
+++ b/apps/extension/src/utils/keystone.ts
@@ -1,6 +1,7 @@
 import {
   TransportWebUSB,
   getKeystoneDevices,
+  StatusCode,
 } from "@keystonehq/hw-transport-webusb";
 
 export async function createKeystoneTransport() {
@@ -18,3 +19,21 @@ export async function createKeystoneTransport() {
   await transport.close();
   return transport;
 }
+
+export function handleKeystoneUSBError(error: {
+  message: string;
+  transportErrorCode: StatusCode;
+}) {
+  if (error.message === "USB_PERMISSIONS_NOT_AVAILABLE") {
+    return "Missing browser permissions";
+  }
+
+  if (error.transportErrorCode === StatusCode.PRS_PARSING_REJECTED) {
+    return `Please reconnect the Keystone hardware wallet and reauthorize.`;
+  }
+  if (error.transportErrorCode === StatusCode.PRS_PARSING_DISALLOWED) {
+    return "Please reconnect the Keystone on home screen and reauthorize.";
+  }
+
+  return "Communication with the Keystone device failed. Please ensure the Keystone is connected, and try again.";
+}

From dfe9431848150a47d728596dfa8a5c22fee8c2c3 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Sat, 12 Oct 2024 09:53:07 +0800
Subject: [PATCH 17/21] fix typo and naming issue

---
 .../src/pages/register/name-password-hardware/index.tsx     | 4 ++--
 apps/extension/src/pages/sign/cosmos/adr36.tsx              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/extension/src/pages/register/name-password-hardware/index.tsx b/apps/extension/src/pages/register/name-password-hardware/index.tsx
index d5cc616c3d..8145fa51a8 100644
--- a/apps/extension/src/pages/register/name-password-hardware/index.tsx
+++ b/apps/extension/src/pages/register/name-password-hardware/index.tsx
@@ -43,7 +43,7 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
   const [isBIP44CardOpen, setIsBIP44CardOpen] = useState(false);
 
   const [keystoneWay, setKeystoneWay] = useState<string>("USB");
-  const [isKeystoneUSB, setIsUSB] = useState(true);
+  const [isKeystoneUSB, setIsKeystoneUSB] = useState(true);
 
   return (
     <RegisterSceneBox>
@@ -173,7 +173,7 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
                 ]}
                 onSelect={(key) => {
                   setKeystoneWay(key);
-                  setIsUSB(key === "USB");
+                  setIsKeystoneUSB(key === "USB");
                 }}
               />
               <Gutter size="1.625rem" />
diff --git a/apps/extension/src/pages/sign/cosmos/adr36.tsx b/apps/extension/src/pages/sign/cosmos/adr36.tsx
index d6b43ff770..375b016631 100644
--- a/apps/extension/src/pages/sign/cosmos/adr36.tsx
+++ b/apps/extension/src/pages/sign/cosmos/adr36.tsx
@@ -109,7 +109,7 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
     Error | undefined
   >(undefined);
 
-  const isKeystonUSB =
+  const isKeystoneUSB =
     signInteractionStore.waitingData?.data.keyType === "keystone" &&
     signInteractionStore.waitingData?.data.keyInsensitive["connectionType"] ===
       "USB";
@@ -424,14 +424,14 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
             isInternal={signInteractionStore.waitingData.isInternal}
           />
         ) : null}
-        {isKeystonUSB && (
+        {isKeystoneUSB && (
           <KeystoneUSBBox
             isKeystoneInteracting={isKeystoneInteracting}
             KeystoneInteractingError={keystoneInteractingError}
           />
         )}
       </Box>
-      {!isKeystonUSB && (
+      {!isKeystoneUSB && (
         <KeystoneSign
           ur={keystoneUR}
           isOpen={isKeystoneInteracting}

From e9618c7f5474aba3094296a720a439fef7b3c9a4 Mon Sep 17 00:00:00 2001
From: aaronisme <aarondongchen@gmail.com>
Date: Sat, 12 Oct 2024 12:21:11 +0800
Subject: [PATCH 18/21] add the bip44path into keyring and add ethereum coin
 type when user choose custom derivation path

---
 .../pages/register/connect-keystone/usb.tsx   | 91 +++++++++++--------
 .../src/pages/register/finalize-key/index.tsx |  5 +
 .../src/keyring-keystone/service.ts           |  1 +
 .../background/src/keyring-keystone/types.ts  |  5 +
 4 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/apps/extension/src/pages/register/connect-keystone/usb.tsx b/apps/extension/src/pages/register/connect-keystone/usb.tsx
index c6701e2cb1..3a0156862b 100644
--- a/apps/extension/src/pages/register/connect-keystone/usb.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/usb.tsx
@@ -37,6 +37,8 @@ const DEFAULT_KEYSTONE_PATHS = [
   "m/44'/330'/0'/0/0",
 ];
 
+const DEFAULT_COIN_TYPE = [118, 60];
+
 const isDefaultPath = (bip44Path: {
   account: number;
   change: number;
@@ -49,6 +51,37 @@ const isDefaultPath = (bip44Path: {
   );
 };
 
+const fetchRequiredAccountsFromKeystone = async (
+  baseApp: Base,
+  paths: string[]
+) => {
+  const keys = [];
+  let device;
+  let deviceId;
+  let masterFingerprint;
+  for (const path of paths) {
+    const res = await baseApp.getURAccount(
+      path,
+      Curve.secp256k1,
+      DerivationAlgorithm.slip10
+    );
+    const sdk = new KeystoneSDK({
+      origin: "Keplr Extension",
+    });
+    const account = sdk.parseMultiAccounts(res.toUR());
+    keys.push(account.keys[0]);
+    device = account.device;
+    deviceId = account.deviceId;
+    masterFingerprint = account.masterFingerprint;
+  }
+  return {
+    keys,
+    device,
+    deviceId,
+    masterFingerprint,
+  };
+};
+
 export const ConnectKeystoneUSBScene: FunctionComponent<{
   name: string;
   password: string;
@@ -109,53 +142,31 @@ export const ConnectKeystoneUSBScene: FunctionComponent<{
     }
 
     // step2: get the keystone accounts
-    const keys = [];
-    let device: string | undefined;
-    let masterFingerprint = "";
-    let deviceId: string | undefined;
     let accounts;
+    let paths = DEFAULT_KEYSTONE_PATHS;
 
     try {
       if (!isDefaultPath(bip44Path)) {
-        const setPath = `m/44'/118'/${bip44Path.account}'/${bip44Path.change}/${bip44Path.addressIndex}`;
-        const res = await baseApp.getURAccount(
-          setPath,
-          Curve.secp256k1,
-          DerivationAlgorithm.slip10
+        paths = DEFAULT_COIN_TYPE.map(
+          (each) =>
+            `m/44'/${each}'/${bip44Path.account}'/${bip44Path.change}/${bip44Path.addressIndex}`
         );
-        const sdk = new KeystoneSDK({
-          origin: "Keplr Extension",
-        });
-        accounts = sdk.parseMultiAccounts(res.toUR());
-        accounts = {
-          ...accounts,
-          connectionType: "USB",
-        };
-      } else {
-        for (const path of DEFAULT_KEYSTONE_PATHS) {
-          const res = await baseApp.getURAccount(
-            path,
-            Curve.secp256k1,
-            DerivationAlgorithm.slip10
-          );
-          const sdk = new KeystoneSDK({
-            origin: "Keplr Extension",
-          });
-          const account = sdk.parseMultiAccounts(res.toUR());
-          keys.push(account.keys[0]);
-          device = account.device;
-          deviceId = account.deviceId;
-          masterFingerprint = account.masterFingerprint;
-          accounts = {
-            device,
-            deviceId,
-            masterFingerprint,
-            keys,
-            connectionType: "USB",
-          };
-        }
       }
 
+      const result = await fetchRequiredAccountsFromKeystone(baseApp, paths);
+      accounts = {
+        device: result?.device,
+        deviceId: result?.deviceId,
+        masterFingerprint: result?.masterFingerprint,
+        keys: result?.keys,
+        bip44Path: {
+          account: bip44Path.account ?? 0,
+          change: bip44Path.change ?? 0,
+          addressIndex: bip44Path.addressIndex ?? 0,
+        },
+        connectionType: "USB",
+      };
+
       setStep("app");
       //
       sceneTransition.replaceAll("finalize-key", {
diff --git a/apps/extension/src/pages/register/finalize-key/index.tsx b/apps/extension/src/pages/register/finalize-key/index.tsx
index cc72b8a080..4cf075c604 100644
--- a/apps/extension/src/pages/register/finalize-key/index.tsx
+++ b/apps/extension/src/pages/register/finalize-key/index.tsx
@@ -55,6 +55,11 @@ export const FinalizeKeyScene: FunctionComponent<{
     };
   };
   keystone?: MultiAccounts & {
+    bip44Path: {
+      account: number;
+      change: number;
+      addressIndex: number;
+    };
     connectionType?: "USB" | "QR";
   };
   stepPrevious: number;
diff --git a/packages/background/src/keyring-keystone/service.ts b/packages/background/src/keyring-keystone/service.ts
index ec03e9e25e..81ea1632ff 100644
--- a/packages/background/src/keyring-keystone/service.ts
+++ b/packages/background/src/keyring-keystone/service.ts
@@ -31,6 +31,7 @@ export class KeyRingKeystoneService {
         device: multiAccounts.device,
         deviceId: multiAccounts.deviceId,
         keys,
+        bip44Path: multiAccounts.bip44Path,
         connectionType: multiAccounts.connectionType,
       },
       sensitive: {},
diff --git a/packages/background/src/keyring-keystone/types.ts b/packages/background/src/keyring-keystone/types.ts
index 4d56cb0c7d..ce63ddbaaf 100644
--- a/packages/background/src/keyring-keystone/types.ts
+++ b/packages/background/src/keyring-keystone/types.ts
@@ -1,6 +1,11 @@
 export interface MultiAccounts {
   masterFingerprint: string;
   keys: Account[];
+  bip44Path: {
+    account: number;
+    change: number;
+    addressIndex: number;
+  };
   device?: string;
   deviceId?: string;
   connectionType?: "USB" | "QR";

From d6d31b041670d86d28a36c2af7ce6a8e7e89a484 Mon Sep 17 00:00:00 2001
From: Thunnini <yunjh1994@gmail.com>
Date: Wed, 16 Oct 2024 21:49:59 +0900
Subject: [PATCH 19/21] Make the step total 3 if keystone mode is USB

---
 .../register/name-password-hardware/index.tsx | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/extension/src/pages/register/name-password-hardware/index.tsx b/apps/extension/src/pages/register/name-password-hardware/index.tsx
index 8145fa51a8..c25959d2e4 100644
--- a/apps/extension/src/pages/register/name-password-hardware/index.tsx
+++ b/apps/extension/src/pages/register/name-password-hardware/index.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from "react";
+import React, { FunctionComponent, useEffect, useState } from "react";
 import { RegisterSceneBox } from "../components/register-scene-box";
 import { Box } from "../../../components/box";
 import { FormNamePassword, useFormNamePassword } from "../components/form";
@@ -22,6 +22,7 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
   const sceneTransition = useSceneTransition();
   const intl = useIntl();
 
+  const [headerHasSet, setHeaderHasSet] = useState(false);
   const header = useRegisterHeader();
   useSceneEvents({
     onWillVisible: () => {
@@ -33,18 +34,32 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
         stepCurrent: 1,
         stepTotal: type === "keystone" ? 4 : 3,
       });
+      setHeaderHasSet(true);
     },
   });
 
+  const [keystoneWay, setKeystoneWay] = useState<string>("USB");
+  const [isKeystoneUSB, setIsKeystoneUSB] = useState(true);
+  useEffect(() => {
+    if (headerHasSet && type === "keystone") {
+      const prev = header.header;
+      if ("stepTotal" in prev) {
+        if (isKeystoneUSB) {
+          // USB에서는 step 3개밖에 안 필요하더라...
+          header.setHeader({ ...prev, stepTotal: 3 });
+        } else {
+          header.setHeader({ ...prev, stepTotal: 4 });
+        }
+      }
+    }
+  }, [header, headerHasSet, isKeystoneUSB, type]);
+
   const form = useFormNamePassword();
 
   const [connectTo, setConnectTo] = useState<string>("Cosmos");
   const bip44PathState = useBIP44PathState(true);
   const [isBIP44CardOpen, setIsBIP44CardOpen] = useState(false);
 
-  const [keystoneWay, setKeystoneWay] = useState<string>("USB");
-  const [isKeystoneUSB, setIsKeystoneUSB] = useState(true);
-
   return (
     <RegisterSceneBox>
       <form

From 85a8bdb06a4e0d38a63452d05c9662a3a9734303 Mon Sep 17 00:00:00 2001
From: Thunnini <yunjh1994@gmail.com>
Date: Wed, 16 Oct 2024 22:43:51 +0900
Subject: [PATCH 20/21] Fix a mistake

---
 packages/stores-core/src/core/tokens.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/stores-core/src/core/tokens.ts b/packages/stores-core/src/core/tokens.ts
index b232b4c5a2..0bfc52fd62 100644
--- a/packages/stores-core/src/core/tokens.ts
+++ b/packages/stores-core/src/core/tokens.ts
@@ -154,7 +154,9 @@ export class TokensStore {
           }
         }
 
-        modularChainInfoImpl.addCurrencies("cosmos", ...adds);
+        this.chainStore
+          .getChain(modularChainInfoImpl.chainId)
+          .addCurrencies(...adds);
       } else if ("starknet" in modularChainInfoImpl.embedded) {
         if ("starknet" in modularChainInfoImpl.embedded) {
           const chainIdentifier = ChainIdHelper.parse(

From cfed6188382a321c322da8ccecb8ac16de21a082 Mon Sep 17 00:00:00 2001
From: Thunnini <yunjh1994@gmail.com>
Date: Wed, 16 Oct 2024 22:44:10 +0900
Subject: [PATCH 21/21] Revert "Merge branch 'keystone-usb' into develop"

This reverts commit 6fd3854d37bbc20f77ad310908f46674d6283343, reversing
changes made to 2e96b6c977271b78db72af6cc6868dc9ae0340ab.
---
 apps/extension/package.json                   |   2 -
 apps/extension/src/languages/en.json          |  14 +-
 apps/extension/src/languages/ko.json          |  12 -
 apps/extension/src/languages/zh-cn.json       |  12 -
 .../pages/register/connect-keystone/index.tsx |   3 +-
 .../pages/register/connect-keystone/scan.tsx  |   3 +-
 .../pages/register/connect-keystone/usb.tsx   | 353 ------------------
 .../src/pages/register/finalize-key/index.tsx |   9 +-
 apps/extension/src/pages/register/index.tsx   |  14 +-
 .../register/name-password-hardware/index.tsx |  98 +----
 .../sign/components/keystone-usb-box.tsx      |  48 ---
 .../extension/src/pages/sign/cosmos/adr36.tsx |  58 +--
 .../src/pages/sign/cosmos/tx/view.tsx         |  56 +--
 .../src/pages/sign/ethereum/view.tsx          |  57 +--
 .../pages/sign/utils/handle-cosmos-sign.ts    |  44 +--
 .../src/pages/sign/utils/handle-eth-sign.ts   |  44 +--
 .../src/pages/sign/utils/keystone.ts          |   1 -
 apps/extension/src/utils/keystone.ts          |  39 --
 .../src/keyring-keystone/service.ts           |   2 -
 .../background/src/keyring-keystone/types.ts  |   6 -
 yarn.lock                                     |  53 ---
 21 files changed, 83 insertions(+), 845 deletions(-)
 delete mode 100644 apps/extension/src/pages/register/connect-keystone/usb.tsx
 delete mode 100644 apps/extension/src/pages/sign/components/keystone-usb-box.tsx
 delete mode 100644 apps/extension/src/utils/keystone.ts

diff --git a/apps/extension/package.json b/apps/extension/package.json
index f47e71114c..4eebc7ef62 100644
--- a/apps/extension/package.json
+++ b/apps/extension/package.json
@@ -52,8 +52,6 @@
     "@keplr-wallet/types": "0.12.138",
     "@keplr-wallet/unit": "0.12.138",
     "@keystonehq/animated-qr": "^0.8.6",
-    "@keystonehq/hw-app-base": "0.1.1",
-    "@keystonehq/hw-transport-webusb": "0.4.0",
     "@keystonehq/keystone-sdk": "^0.2.3",
     "@ledgerhq/devices": "^6.20.0",
     "@react-spring/web": "^9.6.1",
diff --git a/apps/extension/src/languages/en.json b/apps/extension/src/languages/en.json
index f868025211..41df93cc7a 100644
--- a/apps/extension/src/languages/en.json
+++ b/apps/extension/src/languages/en.json
@@ -105,10 +105,6 @@
   "pages.register.name-password-hardware.connect-to-terra": "Terra app",
   "pages.register.name-password-hardware.connect-to-secret": "Secret app",
 
-  "pages.register.name-password-hardware.connect-keystone-way": "Connect Keystone via",
-  "pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
-  "pages.register.name-password-hardware.connect-to-keystone-QR": "QR",
-
   "pages.register.recover-mnemonic.title": "Import Existing Wallet",
   "pages.register.recover-mnemonic.paragraph-1": "Enter your recovery phrase here to restore your wallet. Or click on any blank and paste the entire phrase.",
   "pages.register.recover-mnemonic.paragraph-2": "Enter the phrase in the right order without capitalization, punctuation symbols, or spaces.",
@@ -132,7 +128,7 @@
   "pages.register.connect-ledger.use-hid-confirm-title": "Unable to use Web HID",
   "pages.register.connect-ledger.use-hid-confirm-paragraph": "Please enable ‘experimental web platform features’ to use Web HID",
 
-  "pages.register.connect-keystone.paragraph": "Please unlock your Keystone device and connect it to your computer via USB.",
+  "pages.register.connect-keystone.title": "Please Connect Your Hardware Wallet",
   "pages.register.connect-keystone.step-text": "Step {num}",
   "pages.register.connect-keystone.step-1": "Tap “<span>Connect Software Wallet</span>” at the bottom left corner on the Keystone device.",
   "pages.register.connect-keystone.step-2": "Select “<span>Keplr Wallet</span>”.",
@@ -149,10 +145,6 @@
   "pages.register.connect-keystone.tutorial": "Tutorial",
   "pages.register.connect-keystone.unsupported": "Unsupported",
 
-  "pages.register.connect-keystone.usb.title": "Please Connect Your Hardware Wallet",
-  "pages.register.connect-keystone.usb.step-1": "Connect and unlock your Keystone.",
-  "pages.register.connect-keystone.usb.step-2": "Ensure your Keystone 3 Pro is on the homepage.",
-
   "pages.register.enable-chains.title": "Select Chains",
   "pages.register.enable-chains.paragraph": "Don’t worry, you can change your selections anytime in the Manage Chain Visibility in the sidebar menu.",
   "pages.register.enable-chains.search-input-placeholder": "Search networks",
@@ -513,10 +505,6 @@
   "page.sign.keystone.invalid-qrcode": "Invalid QR code",
   "page.sign.keystone.select-valid-qrcode": "Please ensure you have selected a valid QR code from your Keystone device.",
 
-  "page.sign.keystone.usb.box.unknown-error-title": "Unknown error",
-  "page.sign.keystone.usb.box.sign-on-keystone-title": "Sign on Keystone",
-  "page.sign.keystone.usb.box.sign-on-keystone-paragraph": "To proceed, please review and approve the transaction on your Keystone device.",
-
   "page.send.select-asset.title": "Select Asset",
   "page.send.select-asset.search-placeholder": "Search for asset or chain",
   "page.send.select-asset.hide-ibc-token": "Hide IBC token",
diff --git a/apps/extension/src/languages/ko.json b/apps/extension/src/languages/ko.json
index 494e8563ec..2e6f6837b2 100644
--- a/apps/extension/src/languages/ko.json
+++ b/apps/extension/src/languages/ko.json
@@ -105,10 +105,6 @@
   "pages.register.name-password-hardware.connect-to-terra": "테라 앱",
   "pages.register.name-password-hardware.connect-to-secret": "시크릿 앱",
 
-  "pages.register.name-password-hardware.connect-keystone-way": "Keystone를 통해 연결하세요",
-  "pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
-  "pages.register.name-password-hardware.connect-to-keystone-QR": "QR",
-
   "pages.register.recover-mnemonic.title": "기존 지갑 불러오기",
   "pages.register.recover-mnemonic.paragraph-1": "복구 문구를 통해 지갑을 불러올 수 있습니다. 아무 칸이나 선택해서 전체 복구 문구를 붙여 넣어보세요.",
   "pages.register.recover-mnemonic.paragraph-2": "복구 문구의 단어를 올바른 순서로, 정확한 대소문자, 구두점 기호 혹은 공백으로 기입해야만 지갑을 불러올 수 있습니다.",
@@ -149,10 +145,6 @@
   "pages.register.connect-keystone.tutorial": "튜토리얼",
   "pages.register.connect-keystone.unsupported": "미지원",
 
-  "pages.register.connect-keystone.usb.title": "하드웨어 지갑을 연결해 주세요.",
-  "pages.register.connect-keystone.usb.step-1": "키스톤을 연결하고 잠금을 해제하세요.",
-  "pages.register.connect-keystone.usb.step-2": "귀하의 Keystone 3 Pro가 홈페이지에 있도록 하십시오.",
-
   "pages.register.enable-chains.title": "체인 선택하기",
   "pages.register.enable-chains.paragraph": "걱정마세요! 언제든지 사이드바 메뉴에 있는 ‘체인 표시’를 방문해서 설정을 변경할 수 있습니다.",
   "pages.register.enable-chains.search-input-placeholder": "네트워크 검색하기",
@@ -496,10 +488,6 @@
   "page.sign.keystone.invalid-qrcode": "QR 코드가 유효하지 않습니다",
   "page.sign.keystone.select-valid-qrcode": "키스톤 장치에서 유효한 QR 코드를 선택했는지 확인해주세요.",
 
-  "page.sign.keystone.usb.box.unknown-error-title": "알 수 없는 오류",
-  "page.sign.keystone.usb.box.sign-on-keystone-title": "키스톤에 있는 표지판",
-  "page.sign.keystone.usb.box.sign-on-keystone-paragraph": "진행하려면, 귀하의 Keystone 기기에서 거래를 검토하고 승인해 주시기 바랍니다.",
-
   "page.send.select-asset.title": "자산 선택",
   "page.send.select-asset.search-placeholder": "자산이나 체인 이름 검색",
   "page.send.select-asset.hide-ibc-token": "IBC 토큰 숨기기",
diff --git a/apps/extension/src/languages/zh-cn.json b/apps/extension/src/languages/zh-cn.json
index 92ecdbfc2a..ec49dec8c2 100644
--- a/apps/extension/src/languages/zh-cn.json
+++ b/apps/extension/src/languages/zh-cn.json
@@ -99,10 +99,6 @@
   "pages.register.name-password-hardware.connect-to-terra": "Terra应用",
   "pages.register.name-password-hardware.connect-to-secret": "Secret应用",
 
-  "pages.register.name-password-hardware.connect-keystone-way": "选择Keystone连接方式",
-  "pages.register.name-password-hardware.connect-to-keystone-USB": "USB",
-  "pages.register.name-password-hardware.connect-to-keystone-QR": "QR",
-
   "pages.register.recover-mnemonic.title": "导入已有钱包",
   "pages.register.recover-mnemonic.paragraph-1": "输入助记词，或点击任意输入框并粘贴整个助记词。",
   "pages.register.recover-mnemonic.paragraph-2": "按正确的顺序输入助记词，无需大写、标点符号或空格。",
@@ -143,10 +139,6 @@
   "pages.register.connect-keystone.tutorial": "教程",
   "pages.register.connect-keystone.unsupported": "暂不支持",
 
-  "pages.register.connect-keystone.usb.title": "请连接您的硬件钱包",
-  "pages.register.connect-keystone.usb.step-1": "连接并解锁您的Keystone.",
-  "pages.register.connect-keystone.usb.step-2": "确保你的 Keystone 3 Pro 在主页上。",
-
   "pages.register.enable-chains.title": "选择链",
   "pages.register.enable-chains.paragraph": "不用担心，你可以随时在侧边栏菜单中的“管理链可见性”中更改你的选择。",
   "pages.register.enable-chains.search-input-placeholder": "搜索网络",
@@ -481,10 +473,6 @@
   "page.sign.keystone.invalid-qrcode": "无效的二维码",
   "page.sign.keystone.select-valid-qrcode": "请确保你从Keystone设备中选择了正确的二维码。",
 
-  "page.sign.keystone.usb.box.unknown-error-title": "未知错误",
-  "page.sign.keystone.usb.box.sign-on-keystone-title": "Keystone 签名",
-  "page.sign.keystone.usb.box.sign-on-keystone-paragraph": "要继续，请在你的Keystone设备上查看并确认交易。",
-
   "page.send.select-asset.title": "选择资产",
   "page.send.select-asset.search-placeholder": "搜索资产或链",
   "page.send.select-asset.hide-ibc-token": "隐藏IBC币种",
diff --git a/apps/extension/src/pages/register/connect-keystone/index.tsx b/apps/extension/src/pages/register/connect-keystone/index.tsx
index 4de4e439f2..324a651a1e 100644
--- a/apps/extension/src/pages/register/connect-keystone/index.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/index.tsx
@@ -12,9 +12,8 @@ import { Button } from "../../../components/button";
 import { ColorPalette } from "../../../styles";
 import { useTheme } from "styled-components";
 import { FormattedMessage, useIntl } from "react-intl";
-export { ConnectKeystoneUSBScene } from "./usb";
 
-export const ConnectKeystoneQRScene: FunctionComponent<{
+export const ConnectKeystoneScene: FunctionComponent<{
   name: string;
   password: string;
   stepPrevious: number;
diff --git a/apps/extension/src/pages/register/connect-keystone/scan.tsx b/apps/extension/src/pages/register/connect-keystone/scan.tsx
index b2eb1c5771..59bb2c3126 100644
--- a/apps/extension/src/pages/register/connect-keystone/scan.tsx
+++ b/apps/extension/src/pages/register/connect-keystone/scan.tsx
@@ -57,11 +57,10 @@ export const ScanKeystoneScene: FunctionComponent<{
     const accounts = sdk.parseMultiAccounts(
       new UR(Buffer.from(ur.cbor, "hex"), ur.type)
     );
-    const enhancedAccounts = { ...accounts, connectionType: "QR" };
     sceneTransition.replaceAll("finalize-key", {
       name,
       password,
-      keystone: enhancedAccounts,
+      keystone: accounts,
       stepPrevious: stepPrevious + 1,
       stepTotal,
     });
diff --git a/apps/extension/src/pages/register/connect-keystone/usb.tsx b/apps/extension/src/pages/register/connect-keystone/usb.tsx
deleted file mode 100644
index 3a0156862b..0000000000
--- a/apps/extension/src/pages/register/connect-keystone/usb.tsx
+++ /dev/null
@@ -1,353 +0,0 @@
-import React, { FunctionComponent, useState } from "react";
-import { RegisterSceneBox } from "../components/register-scene-box";
-import {
-  useSceneEvents,
-  useSceneTransition,
-} from "../../../components/transition";
-import { useRegisterHeader } from "../components/header";
-import { Gutter } from "../../../components/gutter";
-import { Box } from "../../../components/box";
-import { XAxis, YAxis } from "../../../components/axis";
-import { Body1, H2 } from "../../../components/typography";
-import { ColorPalette } from "../../../styles";
-import { Stack } from "../../../components/stack";
-import { Button } from "../../../components/button";
-import { TransportWebUSB } from "@keystonehq/hw-transport-webusb";
-import Base from "@keystonehq/hw-app-base";
-import { createKeystoneTransport } from "../../../utils/keystone";
-import { observer } from "mobx-react-lite";
-import { FormattedMessage, useIntl } from "react-intl";
-import { useTheme } from "styled-components";
-import KeystoneSDK, {
-  Curve,
-  DerivationAlgorithm,
-} from "@keystonehq/keystone-sdk";
-import { KeystoneIcon } from "../../../components/icon/keystone";
-
-type Step = "unknown" | "connected" | "app";
-
-const DEFAULT_KEYSTONE_PATHS = [
-  "m/44'/118'/0'/0/0", // cosmos path
-  "m/44'/60'/0'/0/0", // ethereum path
-  "m/44'/529'/0'/0/0",
-  "m/44'/394'/0'/0/0",
-  "m/44'/234'/0'/0/0",
-  "m/44'/564'/0'/0/0",
-  "m/44'/459'/0'/0/0",
-  "m/44'/330'/0'/0/0",
-];
-
-const DEFAULT_COIN_TYPE = [118, 60];
-
-const isDefaultPath = (bip44Path: {
-  account: number;
-  change: number;
-  addressIndex: number;
-}) => {
-  return (
-    bip44Path.account === 0 &&
-    bip44Path.change === 0 &&
-    bip44Path.addressIndex === 0
-  );
-};
-
-const fetchRequiredAccountsFromKeystone = async (
-  baseApp: Base,
-  paths: string[]
-) => {
-  const keys = [];
-  let device;
-  let deviceId;
-  let masterFingerprint;
-  for (const path of paths) {
-    const res = await baseApp.getURAccount(
-      path,
-      Curve.secp256k1,
-      DerivationAlgorithm.slip10
-    );
-    const sdk = new KeystoneSDK({
-      origin: "Keplr Extension",
-    });
-    const account = sdk.parseMultiAccounts(res.toUR());
-    keys.push(account.keys[0]);
-    device = account.device;
-    deviceId = account.deviceId;
-    masterFingerprint = account.masterFingerprint;
-  }
-  return {
-    keys,
-    device,
-    deviceId,
-    masterFingerprint,
-  };
-};
-
-export const ConnectKeystoneUSBScene: FunctionComponent<{
-  name: string;
-  password: string;
-  bip44Path: {
-    account: number;
-    change: number;
-    addressIndex: number;
-  };
-  stepPrevious: number;
-  stepTotal: number;
-}> = observer(({ name, password, bip44Path, stepPrevious, stepTotal }) => {
-  const intl = useIntl();
-
-  const sceneTransition = useSceneTransition();
-
-  const header = useRegisterHeader();
-  useSceneEvents({
-    onWillVisible: () => {
-      header.setHeader({
-        mode: "step",
-        title: intl.formatMessage({
-          id: "pages.register.connect-keystone.usb.title",
-        }),
-        paragraphs: [],
-        stepCurrent: stepPrevious + 1,
-        stepTotal: stepTotal,
-      });
-    },
-  });
-
-  const [step, setStep] = useState<Step>("unknown");
-  const [isLoading, setIsLoading] = useState(false);
-
-  const connectKeystone = async () => {
-    setIsLoading(true);
-
-    let transport: TransportWebUSB;
-
-    try {
-      transport = await createKeystoneTransport();
-    } catch {
-      setStep("unknown");
-      setIsLoading(false);
-      return;
-    }
-
-    const baseApp = new Base(transport as any);
-
-    // step1: make sure the device is connected and unlocked
-    try {
-      await baseApp.getAppConfig();
-      setStep("connected");
-    } catch (e) {
-      console.log(e);
-      setStep("unknown");
-      setIsLoading(false);
-      return;
-    }
-
-    // step2: get the keystone accounts
-    let accounts;
-    let paths = DEFAULT_KEYSTONE_PATHS;
-
-    try {
-      if (!isDefaultPath(bip44Path)) {
-        paths = DEFAULT_COIN_TYPE.map(
-          (each) =>
-            `m/44'/${each}'/${bip44Path.account}'/${bip44Path.change}/${bip44Path.addressIndex}`
-        );
-      }
-
-      const result = await fetchRequiredAccountsFromKeystone(baseApp, paths);
-      accounts = {
-        device: result?.device,
-        deviceId: result?.deviceId,
-        masterFingerprint: result?.masterFingerprint,
-        keys: result?.keys,
-        bip44Path: {
-          account: bip44Path.account ?? 0,
-          change: bip44Path.change ?? 0,
-          addressIndex: bip44Path.addressIndex ?? 0,
-        },
-        connectionType: "USB",
-      };
-
-      setStep("app");
-      //
-      sceneTransition.replaceAll("finalize-key", {
-        name,
-        password,
-        keystone: accounts,
-        stepPrevious: stepPrevious + 1,
-        stepTotal,
-      });
-    } catch (e) {
-      console.log(e);
-      setStep("unknown");
-    }
-    setIsLoading(false);
-
-    return;
-  };
-
-  return (
-    <RegisterSceneBox>
-      <Stack gutter="1.25rem">
-        <StepView
-          step={1}
-          paragraph={intl.formatMessage({
-            id: "pages.register.connect-keystone.usb.step-1",
-          })}
-          icon={
-            <Box style={{ opacity: step !== "unknown" ? 0.5 : 1 }}>
-              <KeystoneIcon />
-            </Box>
-          }
-          focused={step === "unknown"}
-          completed={step !== "unknown"}
-        />
-        <StepView
-          step={2}
-          paragraph={intl.formatMessage({
-            id: "pages.register.connect-keystone.usb.step-2",
-          })}
-          icon={
-            <Box style={{ opacity: step !== "connected" ? 0.5 : 1 }}>
-              <CosmosIcon />
-            </Box>
-          }
-          focused={step === "connected"}
-          completed={step === "app"}
-        />
-      </Stack>
-      <Gutter size="1.25rem" />
-      <Box width="22.5rem" marginX="auto">
-        <Button
-          text={intl.formatMessage({
-            id: "button.next",
-          })}
-          size="large"
-          isLoading={isLoading}
-          onClick={connectKeystone}
-        />
-      </Box>
-    </RegisterSceneBox>
-  );
-});
-
-const StepView: FunctionComponent<{
-  step: number;
-  paragraph: string;
-  icon?: React.ReactNode;
-
-  focused: boolean;
-  completed: boolean;
-}> = ({ step, paragraph, icon, focused, completed }) => {
-  const theme = useTheme();
-
-  return (
-    <Box
-      paddingX="2rem"
-      paddingY="1.25rem"
-      borderRadius="1.125rem"
-      backgroundColor={
-        focused
-          ? theme.mode === "light"
-            ? ColorPalette["gray-50"]
-            : ColorPalette["gray-500"]
-          : theme.mode === "light"
-          ? "none"
-          : "transparent"
-      }
-    >
-      <XAxis alignY="center">
-        <div>{icon}</div>
-        <Gutter size="1.25rem" />
-        <YAxis>
-          <XAxis>
-            <H2
-              style={{
-                color: focused
-                  ? theme.mode === "light"
-                    ? ColorPalette["gray-400"]
-                    : ColorPalette["gray-10"]
-                  : theme.mode === "light"
-                  ? ColorPalette["gray-200"]
-                  : ColorPalette["gray-300"],
-              }}
-            >
-              <FormattedMessage
-                id="pages.register.connect-ledger.step-text"
-                values={{ step }}
-              />
-            </H2>
-            {completed ? (
-              <React.Fragment>
-                <Gutter size="0.25rem" />
-                <CheckIcon
-                  color={
-                    focused ? ColorPalette["gray-10"] : ColorPalette["gray-300"]
-                  }
-                />
-              </React.Fragment>
-            ) : null}
-          </XAxis>
-          <Gutter size="0.5rem" />
-          <Body1
-            style={{
-              color: focused
-                ? theme.mode === "light"
-                  ? ColorPalette["gray-300"]
-                  : ColorPalette["gray-200"]
-                : theme.mode === "light"
-                ? ColorPalette["gray-200"]
-                : ColorPalette["gray-300"],
-            }}
-          >
-            {paragraph}
-          </Body1>
-        </YAxis>
-      </XAxis>
-    </Box>
-  );
-};
-
-const CheckIcon: FunctionComponent<{
-  color: string;
-}> = ({ color }) => {
-  return (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="25"
-      fill="none"
-      viewBox="0 0 24 25"
-    >
-      <path
-        fill={color}
-        d="M9 16.67L4.83 12.5l-1.42 1.41L9 19.5l12-12-1.41-1.41L9 16.67z"
-      />
-    </svg>
-  );
-};
-
-const CosmosIcon: FunctionComponent = () => {
-  return (
-    <svg
-      width="auto"
-      height="2rem"
-      viewBox="0 0 80 81"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <rect x="8.5" y="9" width="62" height="62" rx="15.6962" fill="#424247" />
-      <circle
-        cx="39.8219"
-        cy="40.321"
-        r="12.1578"
-        stroke="#F6F6F9"
-        strokeWidth="4.04115"
-      />
-      <path
-        d="M54.0003 25.498L24.999 54.4993"
-        stroke="#F6F6F9"
-        strokeWidth="4.04115"
-      />
-    </svg>
-  );
-};
diff --git a/apps/extension/src/pages/register/finalize-key/index.tsx b/apps/extension/src/pages/register/finalize-key/index.tsx
index b319d34803..8b24428fe9 100644
--- a/apps/extension/src/pages/register/finalize-key/index.tsx
+++ b/apps/extension/src/pages/register/finalize-key/index.tsx
@@ -54,14 +54,7 @@ export const FinalizeKeyScene: FunctionComponent<{
       addressIndex: number;
     };
   };
-  keystone?: MultiAccounts & {
-    bip44Path: {
-      account: number;
-      change: number;
-      addressIndex: number;
-    };
-    connectionType?: "USB" | "QR";
-  };
+  keystone?: MultiAccounts;
   stepPrevious: number;
   stepTotal: number;
 }> = observer(
diff --git a/apps/extension/src/pages/register/index.tsx b/apps/extension/src/pages/register/index.tsx
index deabc41dba..b0c91ab2d3 100644
--- a/apps/extension/src/pages/register/index.tsx
+++ b/apps/extension/src/pages/register/index.tsx
@@ -35,10 +35,7 @@ import { useStore } from "../../stores";
 import { useSearchParams } from "react-router-dom";
 import * as KeplrWalletPrivate from "keplr-wallet-private";
 import { BackUpPrivateKeyScene } from "./back-up-private-key";
-import {
-  ConnectKeystoneQRScene,
-  ConnectKeystoneUSBScene,
-} from "./connect-keystone";
+import { ConnectKeystoneScene } from "./connect-keystone";
 import { ScanKeystoneScene } from "./connect-keystone/scan";
 
 const Container = styled.div`
@@ -233,13 +230,8 @@ const RegisterPageImpl: FunctionComponent = observer(() => {
               width: "40rem",
             },
             {
-              name: "connect-keystone-qr",
-              element: ConnectKeystoneQRScene,
-              width: "40rem",
-            },
-            {
-              name: "connect-keystone-usb",
-              element: ConnectKeystoneUSBScene,
+              name: "connect-keystone",
+              element: ConnectKeystoneScene,
               width: "40rem",
             },
             {
diff --git a/apps/extension/src/pages/register/name-password-hardware/index.tsx b/apps/extension/src/pages/register/name-password-hardware/index.tsx
index c25959d2e4..8a93d0550b 100644
--- a/apps/extension/src/pages/register/name-password-hardware/index.tsx
+++ b/apps/extension/src/pages/register/name-password-hardware/index.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useState } from "react";
+import React, { FunctionComponent, useState } from "react";
 import { RegisterSceneBox } from "../components/register-scene-box";
 import { Box } from "../../../components/box";
 import { FormNamePassword, useFormNamePassword } from "../components/form";
@@ -22,7 +22,6 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
   const sceneTransition = useSceneTransition();
   const intl = useIntl();
 
-  const [headerHasSet, setHeaderHasSet] = useState(false);
   const header = useRegisterHeader();
   useSceneEvents({
     onWillVisible: () => {
@@ -34,30 +33,14 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
         stepCurrent: 1,
         stepTotal: type === "keystone" ? 4 : 3,
       });
-      setHeaderHasSet(true);
     },
   });
 
-  const [keystoneWay, setKeystoneWay] = useState<string>("USB");
-  const [isKeystoneUSB, setIsKeystoneUSB] = useState(true);
-  useEffect(() => {
-    if (headerHasSet && type === "keystone") {
-      const prev = header.header;
-      if ("stepTotal" in prev) {
-        if (isKeystoneUSB) {
-          // USB에서는 step 3개밖에 안 필요하더라...
-          header.setHeader({ ...prev, stepTotal: 3 });
-        } else {
-          header.setHeader({ ...prev, stepTotal: 4 });
-        }
-      }
-    }
-  }, [header, headerHasSet, isKeystoneUSB, type]);
-
   const form = useFormNamePassword();
 
   const [connectTo, setConnectTo] = useState<string>("Cosmos");
-  const bip44PathState = useBIP44PathState(true);
+
+  const bip44PathState = useBIP44PathState(type === "ledger");
   const [isBIP44CardOpen, setIsBIP44CardOpen] = useState(false);
 
   return (
@@ -74,16 +57,7 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
               stepTotal: 3,
             });
           } else if (type === "keystone") {
-            if (isKeystoneUSB) {
-              return sceneTransition.push("connect-keystone-usb", {
-                name: data.name,
-                password: data.password,
-                bip44Path: isKeystoneUSB ? bip44PathState.getPath() : undefined,
-                stepPrevious: 1,
-                stepTotal: 3,
-              });
-            }
-            return sceneTransition.push("connect-keystone-qr", {
+            sceneTransition.push("connect-keystone", {
               name: data.name,
               password: data.password,
               stepPrevious: 1,
@@ -160,70 +134,6 @@ export const RegisterNamePasswordHardwareScene: FunctionComponent<{
               <Gutter size="1.25rem" />
             </React.Fragment>
           ) : undefined}
-          {type === "keystone" ? (
-            <React.Fragment>
-              <Gutter size="1rem" />
-              <Label
-                content={intl.formatMessage({
-                  id: "pages.register.name-password-hardware.connect-keystone-way",
-                })}
-              />
-              <Dropdown
-                color="text-input"
-                size="large"
-                selectedItemKey={keystoneWay}
-                items={[
-                  {
-                    key: "USB",
-                    label: intl.formatMessage({
-                      id: "pages.register.name-password-hardware.connect-to-keystone-USB",
-                    }),
-                  },
-                  {
-                    key: "QR",
-                    label: intl.formatMessage({
-                      id: "pages.register.name-password-hardware.connect-to-keystone-QR",
-                    }),
-                  },
-                ]}
-                onSelect={(key) => {
-                  setKeystoneWay(key);
-                  setIsKeystoneUSB(key === "USB");
-                }}
-              />
-              <Gutter size="1.625rem" />
-              {isKeystoneUSB && (
-                <React.Fragment>
-                  <VerticalCollapseTransition
-                    width="100%"
-                    collapsed={isBIP44CardOpen}
-                  >
-                    <Box alignX="center">
-                      <Button
-                        size="small"
-                        color="secondary"
-                        text={intl.formatMessage({
-                          id: "button.advanced",
-                        })}
-                        onClick={() => {
-                          setIsBIP44CardOpen(true);
-                        }}
-                      />
-                    </Box>
-                  </VerticalCollapseTransition>
-                  <VerticalCollapseTransition collapsed={!isBIP44CardOpen}>
-                    <SetBip44PathCard
-                      state={bip44PathState}
-                      onClose={() => {
-                        setIsBIP44CardOpen(false);
-                      }}
-                    />
-                  </VerticalCollapseTransition>
-                </React.Fragment>
-              )}
-              <Gutter size="1.25rem" />
-            </React.Fragment>
-          ) : undefined}
         </FormNamePassword>
       </form>
     </RegisterSceneBox>
diff --git a/apps/extension/src/pages/sign/components/keystone-usb-box.tsx b/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
deleted file mode 100644
index 31b662e39c..0000000000
--- a/apps/extension/src/pages/sign/components/keystone-usb-box.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { FunctionComponent } from "react";
-import { VerticalCollapseTransition } from "../../../components/transition/vertical-collapse";
-import { Gutter } from "../../../components/gutter";
-import { GuideBox } from "../../../components/guide-box";
-import { useIntl } from "react-intl";
-
-export const KeystoneUSBBox: FunctionComponent<{
-  isKeystoneInteracting: boolean;
-  KeystoneInteractingError: Error | undefined;
-}> = ({ isKeystoneInteracting, KeystoneInteractingError }) => {
-  const intl = useIntl();
-  return (
-    <VerticalCollapseTransition
-      collapsed={!isKeystoneInteracting && KeystoneInteractingError == null}
-      transitionAlign="bottom"
-    >
-      <Gutter size="0.75rem" />
-      {(() => {
-        if (KeystoneInteractingError) {
-          return (
-            <GuideBox
-              color="warning"
-              title={intl.formatMessage({
-                id: "page.sign.keystone.usb.box.unknown-error-title",
-              })}
-              paragraph={
-                KeystoneInteractingError.message ||
-                KeystoneInteractingError.toString()
-              }
-            />
-          );
-        }
-
-        return (
-          <GuideBox
-            color="default"
-            title={intl.formatMessage({
-              id: "page.sign.keystone.usb.box.sign-on-keystone-title",
-            })}
-            paragraph={intl.formatMessage({
-              id: "page.sign.keystone.usb.box.sign-on-keystone-paragraph",
-            })}
-          />
-        );
-      })()}
-    </VerticalCollapseTransition>
-  );
-};
diff --git a/apps/extension/src/pages/sign/cosmos/adr36.tsx b/apps/extension/src/pages/sign/cosmos/adr36.tsx
index 375b016631..888be84607 100644
--- a/apps/extension/src/pages/sign/cosmos/adr36.tsx
+++ b/apps/extension/src/pages/sign/cosmos/adr36.tsx
@@ -24,7 +24,6 @@ import { KeyRingService } from "@keplr-wallet/background";
 import { handleExternalInteractionWithNoProceedNext } from "../../../utils";
 import { MessageAdr36Icon } from "../../../components/icon";
 import { ItemLogo } from "../../main/token-detail/msg-items/logo";
-import { KeystoneUSBBox } from "../components/keystone-usb-box";
 
 export const SignCosmosADR36Page: FunctionComponent = observer(() => {
   const { chainStore, signInteractionStore, uiConfigStore } = useStore();
@@ -109,11 +108,6 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
     Error | undefined
   >(undefined);
 
-  const isKeystoneUSB =
-    signInteractionStore.waitingData?.data.keyType === "keystone" &&
-    signInteractionStore.waitingData?.data.keyInsensitive["connectionType"] ===
-      "USB";
-
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
   const [keystoneUR, setKeystoneUR] = useState<KeystoneUR>();
   const keystoneScanResolve = useRef<(ur: KeystoneUR) => void>();
@@ -140,9 +134,7 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
         isLoading:
           signInteractionStore.isObsoleteInteraction(
             signInteractionStore.waitingData?.id
-          ) ||
-          isLedgerInteracting ||
-          isKeystoneInteracting,
+          ) || isLedgerInteracting,
         onClick: async () => {
           if (signInteractionStore.waitingData) {
             const signDocWrapper =
@@ -171,7 +163,6 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
               signInteractionStore.waitingData.data.keyType === "keystone"
             ) {
               setIsKeystoneInteracting(true);
-              setKeystoneInteractingError(undefined);
               const isEthSigning = KeyRingService.isEthermintLike(
                 chainStore.getChain(
                   signInteractionStore.waitingData.data.chainId
@@ -229,7 +220,6 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
               }
             } finally {
               setIsLedgerInteracting(false);
-              setIsKeystoneInteracting(false);
             }
           }
         },
@@ -424,35 +414,27 @@ export const SignCosmosADR36Page: FunctionComponent = observer(() => {
             isInternal={signInteractionStore.waitingData.isInternal}
           />
         ) : null}
-        {isKeystoneUSB && (
-          <KeystoneUSBBox
-            isKeystoneInteracting={isKeystoneInteracting}
-            KeystoneInteractingError={keystoneInteractingError}
-          />
-        )}
       </Box>
-      {!isKeystoneUSB && (
-        <KeystoneSign
-          ur={keystoneUR}
-          isOpen={isKeystoneInteracting}
-          close={() => {
+      <KeystoneSign
+        ur={keystoneUR}
+        isOpen={isKeystoneInteracting}
+        close={() => {
+          setIsKeystoneInteracting(false);
+        }}
+        onScan={(ur) => {
+          if (keystoneScanResolve.current === undefined) {
+            throw new Error("Keystone Scan Error");
+          }
+          keystoneScanResolve.current(ur);
+        }}
+        error={keystoneInteractingError}
+        onCloseError={() => {
+          if (keystoneInteractingError) {
             setIsKeystoneInteracting(false);
-          }}
-          onScan={(ur) => {
-            if (keystoneScanResolve.current === undefined) {
-              throw new Error("Keystone Scan Error");
-            }
-            keystoneScanResolve.current(ur);
-          }}
-          error={keystoneInteractingError}
-          onCloseError={() => {
-            if (keystoneInteractingError) {
-              setIsKeystoneInteracting(false);
-            }
-            setKeystoneInteractingError(undefined);
-          }}
-        />
-      )}
+          }
+          setKeystoneInteractingError(undefined);
+        }}
+      />
     </HeaderLayout>
   );
 });
diff --git a/apps/extension/src/pages/sign/cosmos/tx/view.tsx b/apps/extension/src/pages/sign/cosmos/tx/view.tsx
index 9a4f701bef..75ef21984b 100644
--- a/apps/extension/src/pages/sign/cosmos/tx/view.tsx
+++ b/apps/extension/src/pages/sign/cosmos/tx/view.tsx
@@ -30,7 +30,6 @@ import { handleCosmosPreSign } from "../../utils/handle-cosmos-sign";
 import { KeplrError } from "@keplr-wallet/router";
 import { ErrModuleLedgerSign } from "../../utils/ledger-types";
 import { LedgerGuideBox } from "../../components/ledger-guide-box";
-import { KeystoneUSBBox } from "../../components/keystone-usb-box";
 import { Gutter } from "../../../../components/gutter";
 import { GuideBox } from "../../../../components/guide-box";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -339,10 +338,6 @@ export const CosmosTxView: FunctionComponent<{
     Error | undefined
   >(undefined);
 
-  const isKeystonUSB =
-    interactionData.data.keyType === "keystone" &&
-    interactionData.data.keyInsensitive["connectionType"] === "USB";
-
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
   const [keystoneUR, setKeystoneUR] = useState<KeystoneUR>();
   const keystoneScanResolve = useRef<(ur: KeystoneUR) => void>();
@@ -391,7 +386,6 @@ export const CosmosTxView: FunctionComponent<{
         };
       } else if (interactionData.data.keyType === "keystone") {
         setIsKeystoneInteracting(true);
-        setKeystoneInteractingError(undefined);
         const isEthSigning = KeyRingService.isEthermintLike(
           chainStore.getChain(chainId)
         );
@@ -466,7 +460,6 @@ export const CosmosTxView: FunctionComponent<{
         }
       } finally {
         setIsLedgerInteracting(false);
-        setIsKeystoneInteracting(false);
       }
     }
   };
@@ -506,8 +499,7 @@ export const CosmosTxView: FunctionComponent<{
         disabled: buttonDisabled,
         isLoading:
           signInteractionStore.isObsoleteInteraction(interactionData.id) ||
-          isLedgerInteracting ||
-          isKeystoneInteracting,
+          isLedgerInteracting,
         onClick: approve,
       }}
     >
@@ -743,35 +735,27 @@ export const CosmosTxView: FunctionComponent<{
           ledgerInteractingError={ledgerInteractingError}
           isInternal={interactionData.isInternal}
         />
-        {isKeystonUSB && (
-          <KeystoneUSBBox
-            isKeystoneInteracting={isKeystoneInteracting}
-            KeystoneInteractingError={keystoneInteractingError}
-          />
-        )}
       </Box>
-      {!isKeystonUSB && (
-        <KeystoneSign
-          ur={keystoneUR}
-          isOpen={isKeystoneInteracting}
-          close={() => {
+      <KeystoneSign
+        ur={keystoneUR}
+        isOpen={isKeystoneInteracting}
+        close={() => {
+          setIsKeystoneInteracting(false);
+        }}
+        onScan={(ur) => {
+          if (keystoneScanResolve.current === undefined) {
+            throw new Error("Keystone Scan Error");
+          }
+          keystoneScanResolve.current(ur);
+        }}
+        error={keystoneInteractingError}
+        onCloseError={() => {
+          if (keystoneInteractingError) {
             setIsKeystoneInteracting(false);
-          }}
-          onScan={(ur) => {
-            if (keystoneScanResolve.current === undefined) {
-              throw new Error("Keystone Scan Error");
-            }
-            keystoneScanResolve.current(ur);
-          }}
-          error={keystoneInteractingError}
-          onCloseError={() => {
-            if (keystoneInteractingError) {
-              setIsKeystoneInteracting(false);
-            }
-            setKeystoneInteractingError(undefined);
-          }}
-        />
-      )}
+          }
+          setKeystoneInteractingError(undefined);
+        }}
+      />
     </HeaderLayout>
   );
 });
diff --git a/apps/extension/src/pages/sign/ethereum/view.tsx b/apps/extension/src/pages/sign/ethereum/view.tsx
index 8db7762ec9..ef9002a555 100644
--- a/apps/extension/src/pages/sign/ethereum/view.tsx
+++ b/apps/extension/src/pages/sign/ethereum/view.tsx
@@ -19,7 +19,6 @@ import { KeplrError } from "@keplr-wallet/router";
 import { ErrModuleLedgerSign } from "../utils/ledger-types";
 import { Buffer } from "buffer/";
 import { LedgerGuideBox } from "../components/ledger-guide-box";
-import { KeystoneUSBBox } from "../components/keystone-usb-box";
 import { EthSignType } from "@keplr-wallet/types";
 import {
   handleEthereumPreSignByKeystone,
@@ -310,10 +309,6 @@ export const EthereumSigningView: FunctionComponent<{
     Error | undefined
   >(undefined);
 
-  const isKeystonUSB =
-    interactionData.data.keyType === "keystone" &&
-    interactionData.data.keyInsensitive["connectionType"] === "USB";
-
   const [isKeystoneInteracting, setIsKeystoneInteracting] = useState(false);
   const [keystoneUR, setKeystoneUR] = useState<KeystoneUR>();
   const keystoneScanResolve = useRef<(ur: KeystoneUR) => void>();
@@ -360,9 +355,7 @@ export const EthereumSigningView: FunctionComponent<{
         isLoading:
           signEthereumInteractionStore.isObsoleteInteraction(
             interactionData.id
-          ) ||
-          isLedgerInteracting ||
-          isKeystoneInteracting,
+          ) || isLedgerInteracting,
         onClick: async () => {
           try {
             let signature;
@@ -378,7 +371,6 @@ export const EthereumSigningView: FunctionComponent<{
               );
             } else if (interactionData.data.keyType === "keystone") {
               setIsKeystoneInteracting(true);
-              setKeystoneInteractingError(undefined);
               signature = await handleEthereumPreSignByKeystone(
                 interactionData,
                 Buffer.from(signingDataText),
@@ -442,7 +434,6 @@ export const EthereumSigningView: FunctionComponent<{
             }
           } finally {
             setIsLedgerInteracting(false);
-            setIsKeystoneInteracting(false);
           }
         },
       }}
@@ -696,35 +687,27 @@ export const EthereumSigningView: FunctionComponent<{
           ledgerInteractingError={ledgerInteractingError}
           isInternal={interactionData.isInternal}
         />
-        {isKeystonUSB && (
-          <KeystoneUSBBox
-            isKeystoneInteracting={isKeystoneInteracting}
-            KeystoneInteractingError={keystoneInteractingError}
-          />
-        )}
       </Box>
-      {!isKeystonUSB && (
-        <KeystoneSign
-          ur={keystoneUR}
-          isOpen={isKeystoneInteracting}
-          close={() => {
+      <KeystoneSign
+        ur={keystoneUR}
+        isOpen={isKeystoneInteracting}
+        close={() => {
+          setIsKeystoneInteracting(false);
+        }}
+        onScan={(ur) => {
+          if (keystoneScanResolve.current === undefined) {
+            throw new Error("Keystone Scan Error");
+          }
+          keystoneScanResolve.current(ur);
+        }}
+        error={keystoneInteractingError}
+        onCloseError={() => {
+          if (keystoneInteractingError) {
             setIsKeystoneInteracting(false);
-          }}
-          onScan={(ur) => {
-            if (keystoneScanResolve.current === undefined) {
-              throw new Error("Keystone Scan Error");
-            }
-            keystoneScanResolve.current(ur);
-          }}
-          error={keystoneInteractingError}
-          onCloseError={() => {
-            if (keystoneInteractingError) {
-              setIsKeystoneInteracting(false);
-            }
-            setKeystoneInteractingError(undefined);
-          }}
-        />
-      )}
+          }
+          setKeystoneInteractingError(undefined);
+        }}
+      />
     </HeaderLayout>
   );
 });
diff --git a/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts b/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
index 6d1e6abc1d..b3ce1d3d4f 100644
--- a/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
+++ b/apps/extension/src/pages/sign/utils/handle-cosmos-sign.ts
@@ -14,7 +14,6 @@ import KeystoneSDK, {
   KeystoneEvmSDK,
   UR,
   utils,
-  UREncoder,
 } from "@keystonehq/keystone-sdk";
 import {
   ErrInvalidPublicKey,
@@ -22,16 +21,10 @@ import {
   ErrInvalidSignature,
   ErrInvalidSigner,
   ErrModuleKeystoneSign,
-  ErrKeystoneUSBCommunication,
   KeystoneKeys,
   KeystoneUR,
   getPathFromPubKey,
 } from "./keystone";
-import {
-  createKeystoneTransport,
-  handleKeystoneUSBError,
-} from "../../../utils/keystone";
-import Base from "@keystonehq/hw-app-base";
 import { PlainObject } from "@keplr-wallet/background";
 import { KeplrError } from "@keplr-wallet/router";
 
@@ -148,8 +141,6 @@ export const handleCosmosPreSign = async (
           : serializeSignDoc(signDocWrapper.aminoSignDoc)
       ).toString("hex");
       const xfp = interactionData.data.keyInsensitive["xfp"] as string;
-      const isUSB =
-        interactionData.data.keyInsensitive["connectionType"] === "USB";
       if (isEthSigning) {
         ur = keystoneSDK.evm.generateSignRequest({
           requestId,
@@ -190,40 +181,17 @@ export const handleCosmosPreSign = async (
           ],
         });
       }
-
-      // Keystone usb signing
-      let urResult: KeystoneUR;
-      if (isUSB) {
-        try {
-          const transport = await createKeystoneTransport();
-          const URString = new UREncoder(ur, Infinity).nextPart().toUpperCase();
-          const baseApp = new Base(transport as any);
-          const response = await baseApp.sendURRequest(URString);
-          urResult = {
-            type: response.type,
-            cbor: response.cbor.toString("hex"),
-          } as KeystoneUR;
-        } catch (e) {
-          throw new KeplrError(
-            ErrModuleKeystoneSign,
-            ErrKeystoneUSBCommunication,
-            handleKeystoneUSBError(e)
-          );
-        }
-      } else {
-        await keystoneOptions.displayQRCode({
-          type: ur.type,
-          cbor: ur.cbor.toString("hex"),
-        });
-        urResult = await keystoneOptions.scanQRCode();
-      }
-
+      await keystoneOptions.displayQRCode({
+        type: ur.type,
+        cbor: ur.cbor.toString("hex"),
+      });
+      const scanResult = await keystoneOptions.scanQRCode();
       let signResult;
       try {
         signResult = keystoneSDK[
           isEthSigning ? "evm" : "cosmos"
         ].parseSignature(
-          new UR(Buffer.from(urResult.cbor, "hex"), urResult.type)
+          new UR(Buffer.from(scanResult.cbor, "hex"), scanResult.type)
         );
       } catch (e) {
         throw new KeplrError(
diff --git a/apps/extension/src/pages/sign/utils/handle-eth-sign.ts b/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
index a343589036..b04f2de4d2 100644
--- a/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
+++ b/apps/extension/src/pages/sign/utils/handle-eth-sign.ts
@@ -2,8 +2,6 @@ import { SignEthereumInteractionStore } from "@keplr-wallet/stores-core";
 import { EthSignType } from "@keplr-wallet/types";
 import Transport from "@ledgerhq/hw-transport";
 import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
-import { UREncoder } from "@keystonehq/keystone-sdk";
-import Base from "@keystonehq/hw-app-base";
 import { KeplrError } from "@keplr-wallet/router";
 import {
   ErrCodeDeviceLocked,
@@ -30,15 +28,9 @@ import {
   encodeEthMessage,
   getEthDataTypeFromSignType,
   getPathFromPubKey,
-  ErrModuleKeystoneSign,
-  ErrKeystoneUSBCommunication,
 } from "./keystone";
 import KeystoneSDK, { UR, utils } from "@keystonehq/keystone-sdk";
 import { EthermintChainIdHelper } from "@keplr-wallet/cosmos";
-import {
-  createKeystoneTransport,
-  handleKeystoneUSBError,
-} from "../../../utils/keystone";
 
 export interface LedgerOptions {
   useWebHID: boolean;
@@ -138,37 +130,13 @@ export const handleEthereumPreSignByKeystone = async (
     chainId: evmChainId,
     address,
   });
-
-  const isUSB = interactionData.data.keyInsensitive["connectionType"] === "USB";
-
-  let urResult: KeystoneUR;
-  if (isUSB) {
-    try {
-      const transport = await createKeystoneTransport();
-      const URString = new UREncoder(ur, Infinity).nextPart().toUpperCase();
-      const baseApp = new Base(transport as any);
-      const response = await baseApp.sendURRequest(URString);
-      urResult = {
-        type: response.type,
-        cbor: response.cbor.toString("hex"),
-      } as KeystoneUR;
-    } catch (e) {
-      throw new KeplrError(
-        ErrModuleKeystoneSign,
-        ErrKeystoneUSBCommunication,
-        handleKeystoneUSBError(e)
-      );
-    }
-  } else {
-    await options.displayQRCode({
-      type: ur.type,
-      cbor: ur.cbor.toString("hex"),
-    });
-    urResult = await options.scanQRCode();
-  }
-
+  await options.displayQRCode({
+    type: ur.type,
+    cbor: ur.cbor.toString("hex"),
+  });
+  const scanResult = await options.scanQRCode();
   const signResult = keystoneSDK.eth.parseSignature(
-    new UR(Buffer.from(urResult.cbor, "hex"), urResult.type)
+    new UR(Buffer.from(scanResult.cbor, "hex"), scanResult.type)
   );
   if (signResult.requestId !== requestId) {
     throw new Error("Invalid request id");
diff --git a/apps/extension/src/pages/sign/utils/keystone.ts b/apps/extension/src/pages/sign/utils/keystone.ts
index 1821f0f7df..25bba14369 100644
--- a/apps/extension/src/pages/sign/utils/keystone.ts
+++ b/apps/extension/src/pages/sign/utils/keystone.ts
@@ -81,4 +81,3 @@ export const ErrInvalidSigner = 1;
 export const ErrInvalidRequestId = 2;
 export const ErrInvalidPublicKey = 3;
 export const ErrInvalidSignature = 4;
-export const ErrKeystoneUSBCommunication = 5;
diff --git a/apps/extension/src/utils/keystone.ts b/apps/extension/src/utils/keystone.ts
deleted file mode 100644
index 0ddbfb2923..0000000000
--- a/apps/extension/src/utils/keystone.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {
-  TransportWebUSB,
-  getKeystoneDevices,
-  StatusCode,
-} from "@keystonehq/hw-transport-webusb";
-
-export async function createKeystoneTransport() {
-  if ((await getKeystoneDevices()).length <= 0) {
-    try {
-      await TransportWebUSB.requestPermission();
-    } catch (e) {
-      throw new Error("USB_PERMISSIONS_NOT_AVAILABLE");
-    }
-  }
-
-  const transport = await TransportWebUSB.connect({
-    timeout: 100000,
-  });
-  await transport.close();
-  return transport;
-}
-
-export function handleKeystoneUSBError(error: {
-  message: string;
-  transportErrorCode: StatusCode;
-}) {
-  if (error.message === "USB_PERMISSIONS_NOT_AVAILABLE") {
-    return "Missing browser permissions";
-  }
-
-  if (error.transportErrorCode === StatusCode.PRS_PARSING_REJECTED) {
-    return `Please reconnect the Keystone hardware wallet and reauthorize.`;
-  }
-  if (error.transportErrorCode === StatusCode.PRS_PARSING_DISALLOWED) {
-    return "Please reconnect the Keystone on home screen and reauthorize.";
-  }
-
-  return "Communication with the Keystone device failed. Please ensure the Keystone is connected, and try again.";
-}
diff --git a/packages/background/src/keyring-keystone/service.ts b/packages/background/src/keyring-keystone/service.ts
index 81ea1632ff..1592925616 100644
--- a/packages/background/src/keyring-keystone/service.ts
+++ b/packages/background/src/keyring-keystone/service.ts
@@ -31,8 +31,6 @@ export class KeyRingKeystoneService {
         device: multiAccounts.device,
         deviceId: multiAccounts.deviceId,
         keys,
-        bip44Path: multiAccounts.bip44Path,
-        connectionType: multiAccounts.connectionType,
       },
       sensitive: {},
     });
diff --git a/packages/background/src/keyring-keystone/types.ts b/packages/background/src/keyring-keystone/types.ts
index ce63ddbaaf..4ccd8a8b94 100644
--- a/packages/background/src/keyring-keystone/types.ts
+++ b/packages/background/src/keyring-keystone/types.ts
@@ -1,14 +1,8 @@
 export interface MultiAccounts {
   masterFingerprint: string;
   keys: Account[];
-  bip44Path: {
-    account: number;
-    change: number;
-    addressIndex: number;
-  };
   device?: string;
   deviceId?: string;
-  connectionType?: "USB" | "QR";
 }
 
 export interface Account {
diff --git a/yarn.lock b/yarn.lock
index 8bdd94c3c0..4c19db6d62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8753,8 +8753,6 @@ __metadata:
     "@keplr-wallet/types": 0.12.138
     "@keplr-wallet/unit": 0.12.138
     "@keystonehq/animated-qr": ^0.8.6
-    "@keystonehq/hw-app-base": 0.1.1
-    "@keystonehq/hw-transport-webusb": 0.4.0
     "@keystonehq/keystone-sdk": ^0.2.3
     "@ledgerhq/devices": ^6.20.0
     "@react-spring/web": ^9.6.1
@@ -9485,17 +9483,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/bc-ur-registry@npm:0.7.0":
-  version: 0.7.0
-  resolution: "@keystonehq/bc-ur-registry@npm:0.7.0"
-  dependencies:
-    "@ngraveio/bc-ur": ^1.1.5
-    bs58check: ^2.1.2
-    tslib: ^2.3.0
-  checksum: d6017e8fda67fc01e28aa1c047b20cce8f07b026f110a5771920879fbd658b845f529b054d1dce2fbabadcfd8da47a2160ab50c73f0bd56678aab4d83899ffcc
-  languageName: node
-  linkType: hard
-
 "@keystonehq/bc-ur-registry@npm:^0.4.4":
   version: 0.4.4
   resolution: "@keystonehq/bc-ur-registry@npm:0.4.4"
@@ -9529,46 +9516,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keystonehq/hw-app-base@npm:0.1.1":
-  version: 0.1.1
-  resolution: "@keystonehq/hw-app-base@npm:0.1.1"
-  dependencies:
-    "@keystonehq/bc-ur-registry": 0.7.0
-    "@keystonehq/hw-transport-error": ^0.0.2
-    "@keystonehq/hw-transport-webusb": ^0.4.0-beta.0
-    "@ngraveio/bc-ur": ^1.1.6
-    uuid: ^8.3.2
-  checksum: 8f8b51f473d8f0998e0124dd73cfa2c212952e1e814369137e4788e2985a2fdd0f1d84e48ddafd70132e60c06ef2276a3637324c265a40eae9369b8d525a0fe7
-  languageName: node
-  linkType: hard
-
-"@keystonehq/hw-transport-error@npm:^0.0.2":
-  version: 0.0.2
-  resolution: "@keystonehq/hw-transport-error@npm:0.0.2"
-  checksum: 681c3344fdd5e59b63ee522a4539fff926c0c050dc645070dfaa4ac73b5c913312667aa491ec2174252e553d83f4c7e90e2dad2a80e9cbcdb4fa40e86565ccf2
-  languageName: node
-  linkType: hard
-
-"@keystonehq/hw-transport-webusb@npm:0.4.0":
-  version: 0.4.0
-  resolution: "@keystonehq/hw-transport-webusb@npm:0.4.0"
-  dependencies:
-    "@keystonehq/hw-transport-error": ^0.0.2
-    buffer: ^6.0.3
-  checksum: 7c56d7b9b73596306be50aae6b5661905a88fb018385b6074c0f18a04efbf5871f7fe93b957c6fe8f966f7c829ff085df444c9fbd23967c0ef2df4a7f9f7e4ae
-  languageName: node
-  linkType: hard
-
-"@keystonehq/hw-transport-webusb@npm:^0.4.0-beta.0":
-  version: 0.4.0-beta.0
-  resolution: "@keystonehq/hw-transport-webusb@npm:0.4.0-beta.0"
-  dependencies:
-    "@keystonehq/hw-transport-error": ^0.0.2
-    buffer: ^6.0.3
-  checksum: 70c85917bb234ae6bd420ecb0744647ca8358f67b1eb043814f45567a0eb1b73ac6c8699cbdc877ad77f9d0a70d8ec5859b73aa4bfdfff8b29fad7dee2fce216
-  languageName: node
-  linkType: hard
-
 "@keystonehq/keystone-sdk@npm:^0.2.3":
   version: 0.2.3
   resolution: "@keystonehq/keystone-sdk@npm:0.2.3"