Merge branch 'delivan/keplr-739' into develop

chainapsis · Feb 4, 2025 · 7d49e52 · 7d49e52
2 parents 5b2c0aa + cfccb91
commit 7d49e52
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/apps/extension/src/pages/sign/ethereum/view.tsx b/apps/extension/src/pages/sign/ethereum/view.tsx
@@ -283,7 +283,7 @@ export const EthereumSigningView: FunctionComponent<{
       case EthSignType.MESSAGE:
         // If the message is 32 bytes, it's probably a hash.
         if (signingDataBuff.length === 32) {
-          return signingDataBuff.toString("hex");
+          return "0x" + signingDataBuff.toString("hex");
         } else {
           const text = (() => {
             const string = signingDataBuff.toString("utf8");
@@ -294,7 +294,8 @@ export const EthereumSigningView: FunctionComponent<{
                 const decoder = new TextDecoder("utf-8", { fatal: true });
                 decoder.decode(new Uint8Array(buf)); // UTF-8 변환 시도
               } catch {
-                return buf.toString("hex");
+                // 정상적인 utf-8 문자열이 아니면 hex로 변환
+                return "0x" + buf.toString("hex");
               }
 
               return buf.toString("utf8");
@@ -315,7 +316,7 @@ export const EthereumSigningView: FunctionComponent<{
       case EthSignType.EIP712:
         return JSON.stringify(JSON.parse(signingDataBuff.toString()), null, 2);
       default:
-        return signingDataBuff.toString("hex");
+        return "0x" + signingDataBuff.toString("hex");
     }
   }, [signingDataBuff, signType]);
 
@@ -369,7 +370,7 @@ export const EthereumSigningView: FunctionComponent<{
     isLedgerInteracting ||
     isKeystoneInteracting;
 
-  const buttonDisabled = txConfigsValidate.interactionBlocked;
+  const buttonDisabled = isTxSigning && txConfigsValidate.interactionBlocked;
 
   return (
     <HeaderLayout
@@ -438,7 +439,7 @@ export const EthereumSigningView: FunctionComponent<{
                 setLedgerInteractingError(undefined);
                 signature = await handleEthereumPreSignByLedger(
                   interactionData,
-                  Buffer.from(signingDataText),
+                  signingDataBuff,
                   {
                     useWebHID: uiConfigStore.useWebHIDLedger,
                   }
@@ -448,7 +449,7 @@ export const EthereumSigningView: FunctionComponent<{
                 setKeystoneInteractingError(undefined);
                 signature = await handleEthereumPreSignByKeystone(
                   interactionData,
-                  Buffer.from(signingDataText),
+                  signingDataBuff,
                   {
                     displayQRCode: async (ur: KeystoneUR) => {
                       setKeystoneUR(ur);
@@ -463,7 +464,7 @@ export const EthereumSigningView: FunctionComponent<{
 
               await signEthereumInteractionStore.approveWithProceedNext(
                 interactionData.id,
-                Buffer.from(signingDataText),
+                signingDataBuff,
                 signature,
                 async (proceedNext) => {
                   if (!proceedNext) {

diff --git a/packages/background/src/keyring-ethereum/service.ts b/packages/background/src/keyring-ethereum/service.ts
@@ -170,7 +170,7 @@ export class KeyRingEthereumService {
                     signature.s,
                     // The metamask doesn't seem to consider the chain id in this case... (maybe bug on metamask?)
                     signature.v
-                      ? Buffer.from("1c", "hex")
+                      ? Buffer.from(signature.v.toString(16), "hex")
                       : Buffer.from("1b", "hex"),
                   ]),
                 };
@@ -600,7 +600,9 @@ export class KeyRingEthereumService {
             origin,
             currentChainId,
             signer,
-            Buffer.from(message),
+            message.startsWith("0x")
+              ? Buffer.from(message.slice(2), "hex")
+              : Buffer.from(message, "utf8"),
             EthSignType.MESSAGE
           );