Merge pull request #1254 from chainapsis/delivan/fix-starknet-ledger-…

…issue-in-qa-2 [QA] Starknet Ledger app support - 2
chainapsis · Dec 3, 2024 · 52deeee · 52deeee
2 parents 372b7f4 + 157c876
commit 52deeee
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 39 deletions.
diff --git a/apps/extension/src/pages/sign/components/ledger-guide-box.tsx b/apps/extension/src/pages/sign/components/ledger-guide-box.tsx
@@ -18,7 +18,8 @@ import { FormattedMessage, useIntl } from "react-intl";
 export const LedgerGuideBox: FunctionComponent<{
   data: {
     keyInsensitive: PlainObject;
-    isEthereum: boolean;
+    isEthereum?: boolean;
+    isStarknet?: boolean;
   };
   isLedgerInteracting: boolean;
   ledgerInteractingError: Error | undefined;
@@ -172,7 +173,7 @@ export const LedgerGuideBox: FunctionComponent<{
                   app = "Secret";
                 }
 
-                if (data?.isEthereum) {
+                if (data.isEthereum) {
                   if (appData["Ethereum"]) {
                     app = "Ethereum";
                   } else {
@@ -193,7 +194,7 @@ export const LedgerGuideBox: FunctionComponent<{
                   }
                 }
 
-                if (appData["Starknet"]) {
+                if (data.isStarknet && appData["Starknet"]) {
                   app = "Starknet";
                 }
 

diff --git a/apps/extension/src/pages/sign/utils/handle-starknet-sign.ts b/apps/extension/src/pages/sign/utils/handle-starknet-sign.ts
@@ -65,6 +65,8 @@ export const connectAndSignDeployAccountTxWithLedger = async (
   transaction: DeployAccountSignerDetails;
   signature: string[];
 }> => {
+  await checkStarknetPubKey(expectedPubKey, options);
+
   let transport: Transport;
   try {
     transport = options.useWebHID
@@ -79,8 +81,6 @@ export const connectAndSignDeployAccountTxWithLedger = async (
     );
   }
 
-  await checkStarknetPubKey(transport, expectedPubKey);
-
   const nonce = 0; // DEPLOY_ACCOUNT transaction will have a nonce zero as it is the first transaction in the account
   const contractAddress =
     providedContractAddress ??
@@ -218,16 +218,14 @@ export const connectAndSignDeployAccountTxWithLedger = async (
       };
     });
   } catch (e) {
-    await transport.close();
-
     if (e.message?.includes("0x5515")) {
       throw new KeplrError(
         ErrModuleLedgerSign,
         ErrCodeDeviceLocked,
         "Device is locked"
       );
     } else {
-      throw e;
+      throw new KeplrError(ErrModuleLedgerSign, 9999, e.message);
     }
   } finally {
     await transport.close();
@@ -240,21 +238,22 @@ export const connectAndSignInvokeTxWithLedger = async (
   details: InvocationsSignerDetails,
   options: LedgerOptions = { useWebHID: true }
 ): Promise<string[]> => {
+  await checkStarknetPubKey(expectedPubKey, options);
+
   let transport: Transport;
   try {
     transport = options?.useWebHID
       ? await TransportWebHID.create()
       : await TransportWebUSB.create();
   } catch (e) {
+    console.error(e);
     throw new KeplrError(
       ErrModuleLedgerSign,
       ErrFailedInit,
       "Failed to init transport"
     );
   }
 
-  await checkStarknetPubKey(transport, expectedPubKey);
-
   const txFields: TxFields | TxV1Fields = (() => {
     switch (details.version) {
       case "0x1":
@@ -301,16 +300,14 @@ export const connectAndSignInvokeTxWithLedger = async (
       return formatStarknetSignature({ r, s });
     });
   } catch (e) {
-    await transport.close();
-
     if (e.message?.includes("0x5515")) {
       throw new KeplrError(
         ErrModuleLedgerSign,
         ErrCodeDeviceLocked,
         "Device is locked"
       );
     } else {
-      throw e;
+      throw new KeplrError(ErrModuleLedgerSign, 9999, e.message);
     }
   } finally {
     await transport.close();
@@ -323,21 +320,22 @@ export const connectAndSignMessageWithLedger = async (
   signer: string,
   options: LedgerOptions = { useWebHID: true }
 ): Promise<string[]> => {
+  await checkStarknetPubKey(expectedPubKey, options);
+
   let transport: Transport;
   try {
     transport = options?.useWebHID
       ? await TransportWebHID.create()
       : await TransportWebUSB.create();
   } catch (e) {
+    console.error(e);
     throw new KeplrError(
       ErrModuleLedgerSign,
       ErrFailedInit,
       "Failed to init transport"
     );
   }
 
-  await checkStarknetPubKey(transport, expectedPubKey);
-
   try {
     const starknetApp = new StarknetClient(transport);
     const res = await starknetApp.signMessage(
@@ -351,16 +349,14 @@ export const connectAndSignMessageWithLedger = async (
       return formatStarknetSignature({ r, s });
     });
   } catch (e) {
-    await transport.close();
-
     if (e.message?.includes("0x5515")) {
       throw new KeplrError(
         ErrModuleLedgerSign,
         ErrCodeDeviceLocked,
         "Device is locked"
       );
     } else {
-      throw e;
+      throw new KeplrError(ErrModuleLedgerSign, 9999, e.message);
     }
   } finally {
     await transport.close();
@@ -410,31 +406,59 @@ function handleLedgerResponse<R>(
 }
 
 async function checkStarknetPubKey(
-  transport: Transport,
-  expectedPubKey: Uint8Array
+  expectedPubKey: Uint8Array,
+  options: LedgerOptions = { useWebHID: true }
 ) {
-  const starknetApp = new StarknetClient(transport);
+  let transport: Transport;
+  try {
+    transport = options?.useWebHID
+      ? await TransportWebHID.create()
+      : await TransportWebUSB.create();
+  } catch (e) {
+    throw new KeplrError(
+      ErrModuleLedgerSign,
+      ErrFailedInit,
+      "Failed to init transport"
+    );
+  }
 
-  const res = await starknetApp.getPubKey(
-    STARKNET_LEDGER_DERIVATION_PATH,
-    false
-  );
+  try {
+    const starknetApp = new StarknetClient(transport);
 
-  handleLedgerResponse(res, () => {
-    const { publicKey } = res;
+    const res = await starknetApp.getPubKey(
+      STARKNET_LEDGER_DERIVATION_PATH,
+      false
+    );
 
-    if (
-      Buffer.from(new PubKeyStarknet(expectedPubKey).toBytes()).toString(
-        "hex"
-      ) !== Buffer.from(new PubKeyStarknet(publicKey).toBytes()).toString("hex")
-    ) {
-      transport.close();
+    return handleLedgerResponse(res, () => {
+      const { publicKey } = res;
 
+      if (
+        Buffer.from(new PubKeyStarknet(expectedPubKey).toBytes()).toString(
+          "hex"
+        ) !==
+        Buffer.from(new PubKeyStarknet(publicKey).toBytes()).toString("hex")
+      ) {
+        throw new KeplrError(
+          ErrModuleLedgerSign,
+          ErrPublicKeyUnmatched,
+          "Public key unmatched"
+        );
+      } else {
+        return publicKey;
+      }
+    });
+  } catch (e) {
+    if (e.message?.includes("0x5515")) {
       throw new KeplrError(
         ErrModuleLedgerSign,
-        ErrPublicKeyUnmatched,
-        "Public key unmatched"
+        ErrCodeDeviceLocked,
+        "Device is locked"
       );
+    } else {
+      throw new KeplrError(ErrModuleLedgerSign, 9999, e.message);
     }
-  });
+  } finally {
+    await transport.close();
+  }
 }
diff --git a/apps/extension/src/pages/starknet/components/account-activation-modal/index.tsx b/apps/extension/src/pages/starknet/components/account-activation-modal/index.tsx
@@ -330,7 +330,7 @@ export const AccountActivationModal: FunctionComponent<{
           data={
             data || {
               keyInsensitive: keyRingStore.selectedKeyInfo!.insensitive,
-              isEthereum: false,
+              isStarknet: true,
             }
           }
           isLedgerInteracting={isLedgerInteracting}

diff --git a/apps/extension/src/pages/starknet/sign/message/view.tsx b/apps/extension/src/pages/starknet/sign/message/view.tsx
@@ -288,7 +288,7 @@ export const SignStarknetMessageView: FunctionComponent<{
         <LedgerGuideBox
           data={{
             keyInsensitive: interactionData.data.keyInsensitive,
-            isEthereum: false,
+            isStarknet: true,
           }}
           isLedgerInteracting={isLedgerInteracting}
           ledgerInteractingError={ledgerInteractingError}

diff --git a/apps/extension/src/pages/starknet/sign/tx/view.tsx b/apps/extension/src/pages/starknet/sign/tx/view.tsx
@@ -599,7 +599,7 @@ export const SignStarknetTxView: FunctionComponent<{
         <LedgerGuideBox
           data={{
             keyInsensitive: interactionData.data.keyInsensitive,
-            isEthereum: false,
+            isStarknet: true,
           }}
           isLedgerInteracting={isLedgerInteracting}
           ledgerInteractingError={ledgerInteractingError}