CU-86dthj1c5 - fix undesired change

CityOfZion · Jun 7, 2024 · 1ce7224 · 1ce7224
1 parent ca88676
commit 1ce7224
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/neon-dappkit/src/NeonSigner.ts b/packages/neon-dappkit/src/NeonSigner.ts
@@ -77,8 +77,12 @@ export class NeonSigner implements Neo3Signer {
   }
 
   async verifyMessage(verifyArgs: SignedMessage): Promise<boolean> {
-    const messageHex = verifyArgs.message ?? u.hexstring2str(verifyArgs.messageHex)
-    return wallet.verify(messageHex, verifyArgs.data, verifyArgs.publicKey) || this.verifyMessageLegacy(verifyArgs)
+    return (await this.verifyMessageSimple(verifyArgs)) || (await this.verifyMessageLegacy(verifyArgs))
+  }
+
+  private async verifyMessageSimple(verifyArgs: SignedMessage): Promise<boolean> {
+    const messageHex = verifyArgs.messageHex ?? u.str2hexstring(verifyArgs.message)
+    return wallet.verify(messageHex, verifyArgs.data, verifyArgs.publicKey)
   }
 
   private async verifyMessageLegacy(verifyArgs: SignedMessage): Promise<boolean> {