From ac81cd0144eaaa8f22a9ac966be98150ec87186c Mon Sep 17 00:00:00 2001
From: dylanuma <dylan@umaproject.org>
Date: Wed, 11 Dec 2024 16:56:22 +0000
Subject: [PATCH] fix: use local packages

---
 api/relayer_auth_submission.ts   | 13 ++++---
 api/relayer_auth_verification.ts | 64 +++++++++++++++++++++++++-------
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/api/relayer_auth_submission.ts b/api/relayer_auth_submission.ts
index d6c662855..69989e7c5 100644
--- a/api/relayer_auth_submission.ts
+++ b/api/relayer_auth_submission.ts
@@ -1,4 +1,5 @@
-import { ethers } from 'ethers';
+import { utils } from 'ethers';
+import { getProvider } from '@/utils/provider';
 
 /**
  * Get the address that signed a configuration update
@@ -6,23 +7,23 @@ import { ethers } from 'ethers';
  * @param signature The signature provided by the relayer
  * @returns The Ethereum address that signed the payload
  */
-async function getSignerAddress(
+export async function getSignerAddress(
   configPayload: Record<string, any>,
   signature: string
 ): Promise<string> {
   try {
     // Convert payload to string and hash it
     const payloadStr = JSON.stringify(configPayload);
-    const messageHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(payloadStr));
+    const messageHash = utils.keccak256(utils.toUtf8Bytes(payloadStr));
 
     // Create signable message
-    const prefixedMessage = ethers.utils.arrayify(messageHash);
+    const prefixedMessage = utils.arrayify(messageHash);
 
     // Recover the address that signed the message
-    const recoveredAddress = ethers.utils.verifyMessage(prefixedMessage, signature);
+    const recoveredAddress = utils.verifyMessage(prefixedMessage, signature);
 
     // Convert to checksum format
-    return ethers.utils.getAddress(recoveredAddress);
+    return utils.getAddress(recoveredAddress);
 
   } catch (error) {
     console.error('Error recovering signer address:', error);
diff --git a/api/relayer_auth_verification.ts b/api/relayer_auth_verification.ts
index d6c662855..30e72b077 100644
--- a/api/relayer_auth_verification.ts
+++ b/api/relayer_auth_verification.ts
@@ -1,31 +1,67 @@
-import { ethers } from 'ethers';
+import { utils } from 'ethers';
+import { getProvider } from '@/utils/provider';
 
 /**
- * Get the address that signed a configuration update
+ * Verify a relayer's configuration update signature and nonce
  * @param configPayload The configuration update payload
- * @param signature The signature provided by the relayer
- * @returns The Ethereum address that signed the payload
+ * @param signature The signature provided by the relayer 
+ * @param nonce The nonce value to prevent replay attacks
+ * @throws Error if signature is invalid or nonce has been used
  */
-async function getSignerAddress(
+export async function verifyRelayerSignature(
   configPayload: Record<string, any>,
-  signature: string
-): Promise<string> {
+  signature: string,
+  nonce: number
+): Promise<void> {
   try {
+    // Verify nonce hasn't been used before
+    if (await hasNonceBeenUsed(nonce)) {
+      throw new Error('Nonce has already been used');
+    }
+
+    // Add nonce to payload before verifying
+    const payloadWithNonce = {
+      ...configPayload,
+      nonce
+    };
+
     // Convert payload to string and hash it
-    const payloadStr = JSON.stringify(configPayload);
-    const messageHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(payloadStr));
+    const payloadStr = JSON.stringify(payloadWithNonce);
+    const messageHash = utils.keccak256(utils.toUtf8Bytes(payloadStr));
 
     // Create signable message
-    const prefixedMessage = ethers.utils.arrayify(messageHash);
+    const prefixedMessage = utils.arrayify(messageHash);
 
     // Recover the address that signed the message
-    const recoveredAddress = ethers.utils.verifyMessage(prefixedMessage, signature);
+    const recoveredAddress = utils.verifyMessage(prefixedMessage, signature);
+    const checksumAddress = utils.getAddress(recoveredAddress);
+
+    // Verify signer is an authorized relayer
+    if (!await isAuthorizedRelayer(checksumAddress)) {
+      throw new Error('Signer is not an authorized relayer');
+    }
 
-    // Convert to checksum format
-    return ethers.utils.getAddress(recoveredAddress);
+    // Store nonce as used
+    await storeUsedNonce(nonce);
 
   } catch (error) {
-    console.error('Error recovering signer address:', error);
+    console.error('Error verifying relayer signature:', error);
     throw error;
   }
+}
+
+// Helper functions that would need to be implemented:
+async function hasNonceBeenUsed(nonce: number): Promise<boolean> {
+  // Check if nonce exists in storage
+  throw new Error('Not implemented');
+}
+
+async function isAuthorizedRelayer(address: string): Promise<boolean> {
+  // Check if address is in authorized relayer list
+  throw new Error('Not implemented'); 
+}
+
+async function storeUsedNonce(nonce: number): Promise<void> {
+  // Store nonce in persistent storage
+  throw new Error('Not implemented');
 }
\ No newline at end of file