From 03ed7613fbdf26261b2e660c2eec297b6c8178f3 Mon Sep 17 00:00:00 2001
From: brolag <info@alfredobonilla.com>
Date: Mon, 4 Nov 2024 17:25:12 -0600
Subject: [PATCH] feat: update signature verification parsing (#43)

---
 apps/web/src/providers/starknet.tsx      |  6 +++---
 apps/web/src/utils/signinWithStarknet.ts | 20 +++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/web/src/providers/starknet.tsx b/apps/web/src/providers/starknet.tsx
index 5a90dbf..4a8b7c9 100644
--- a/apps/web/src/providers/starknet.tsx
+++ b/apps/web/src/providers/starknet.tsx
@@ -10,9 +10,9 @@ export default function StarknetProvider({
 }) {
 	const connectors = [
 		// TODO: add ArgentX
-		// new InjectedConnector({
-		// 	options: { id: "argentX" },
-		// }),
+		new InjectedConnector({
+			options: { id: "argentX" },
+		}),
 		new InjectedConnector({
 			options: { id: "braavos" },
 		}),
diff --git a/apps/web/src/utils/signinWithStarknet.ts b/apps/web/src/utils/signinWithStarknet.ts
index 3e57a92..eaae05a 100644
--- a/apps/web/src/utils/signinWithStarknet.ts
+++ b/apps/web/src/utils/signinWithStarknet.ts
@@ -1,6 +1,7 @@
 import { Account, type Signature } from "starknet";
 import { type TypedData, shortString } from "starknet";
-import type { WeierstrassSignatureType } from "starknet";
+import type { ArraySignatureType } from "starknet";
+
 import {
 	CHAIN_ID,
 	DOMAIN_NAME,
@@ -29,15 +30,9 @@ export const createMessageStructure = (message: string): TypedData => ({
 	},
 });
 
-export const parseSignatureString = (
-	signatureString: string,
-): WeierstrassSignatureType => {
+export const parseSignatureString = (signatureString: string) => {
 	try {
-		const sig = signatureString.split(",");
-		return {
-			r: BigInt(sig[1] ?? 0),
-			s: BigInt(sig[2] ?? 0),
-		} as WeierstrassSignatureType;
+		return signatureString.split(",").map((s) => BigInt(s));
 	} catch (error) {
 		console.error(
 			"Error parsing signature:",
@@ -71,11 +66,14 @@ export const validateCredentials = (
 export const verifySignature = async (
 	address: string,
 	message: TypedData,
-	signature: Signature,
+	signature: bigint[],
 ): Promise<boolean> => {
 	try {
 		const account = new Account(provider, address, SIGNER);
-		const isValid = await account.verifyMessage(message, signature);
+		const isValid = await account.verifyMessage(
+			message,
+			signature as unknown as ArraySignatureType,
+		);
 
 		return isValid;
 	} catch (error) {