refactor: Update getAwsKmsAccount and getGcpKmsAccount to use hashMes…

…sage from thirdweb/utils (#722)
thirdweb-dev · Oct 10, 2024 · deb7908 · deb7908
1 parent 296f142
commit deb7908
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/src/server/utils/wallets/getAwsKmsAccount.ts b/src/server/utils/wallets/getAwsKmsAccount.ts
@@ -8,7 +8,7 @@ import {
   type Address,
 } from "thirdweb";
 import { serializeTransaction } from "thirdweb/transaction";
-import { toBytes } from "thirdweb/utils";
+import { hashMessage } from "thirdweb/utils";
 import type { Account } from "thirdweb/wallets";
 import type {
   SignableMessage,
@@ -78,16 +78,7 @@ export async function getAwsKmsAccount(
   }: {
     message: SignableMessage;
   }): Promise<Hex> {
-    let messageHash: Hex;
-    if (typeof message === "string") {
-      const prefixedMessage = `\x19Ethereum Signed Message:\n${message.length}${message}`;
-      messageHash = keccak256(toBytes(prefixedMessage));
-    } else if ("raw" in message) {
-      messageHash = keccak256(message.raw);
-    } else {
-      throw new Error("Invalid message format");
-    }
-
+    const messageHash = hashMessage(message);
     const signature = await signer.sign(
       Buffer.from(messageHash.slice(2), "hex"),
     );

diff --git a/src/server/utils/wallets/getGcpKmsAccount.ts b/src/server/utils/wallets/getGcpKmsAccount.ts
@@ -8,7 +8,7 @@ import {
   keccak256,
 } from "thirdweb";
 import { serializeTransaction } from "thirdweb/transaction";
-import { toBytes } from "thirdweb/utils";
+import { hashMessage } from "thirdweb/utils";
 import type { Account } from "thirdweb/wallets";
 import type {
   SignableMessage,
@@ -98,16 +98,7 @@ export async function getGcpKmsAccount(
   }: {
     message: SignableMessage;
   }): Promise<Hex> {
-    let messageHash: Hex;
-    if (typeof message === "string") {
-      const prefixedMessage = `\x19Ethereum Signed Message:\n${message.length}${message}`;
-      messageHash = keccak256(toBytes(prefixedMessage));
-    } else if ("raw" in message) {
-      messageHash = keccak256(message.raw);
-    } else {
-      throw new Error("Invalid message format");
-    }
-
+    const messageHash = hashMessage(message);
     const signature = await signer.sign(Bytes.fromString(messageHash));
     return signature.bytes.toString() as Hex;
   }