Merge pull request #17 from WalletConnect/fix/sc-wallet

fix: fixed sc not working with siwe

.env.example

@@ -8,4 +8,5 @@ DIRECT_URL="postgresql://postgres:[YOUR_DB_PASSWORD]@db.[YOUR_SUPABASE_PROJECT_I
 DATABASE_URL="postgresql://postgres:[YOUR_DB_PASSWORD]@db.[YOUR_SUPABASE_PROJECT_ID].supabase.co:6543/postgres?pgbouncer=true"
 REDIS_PASSWORD="authpassword"
 REDIS_HOST=redis
-REDIS_PORT=6379
+REDIS_PORT=6379
+INFURA_API_KEY=

.github/workflows/cd.yml

@@ -63,6 +63,7 @@ jobs:
           TF_VAR_redis_host: ${{ secrets.REDIS_HOST }}
           TF_VAR_redis_port: ${{ secrets.REDIS_PORT }}
           TF_VAR_redis_password: ${{ secrets.REDIS_PASSWORD }}
+          TF_VAR_infura_api_key: ${{ secrets.INFURA_API_KEY }}
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -103,6 +104,7 @@ jobs:
           TF_VAR_redis_host: ${{ secrets.REDIS_HOST }}
           TF_VAR_redis_port: ${{ secrets.REDIS_PORT }}
           TF_VAR_redis_password: ${{ secrets.REDIS_PASSWORD }}
+          TF_VAR_infura_api_key: ${{ secrets.INFURA_API_KEY }}
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

docker-compose.yml

@@ -18,6 +18,7 @@ services:
       REDIS_PASSWORD: ${REDIS_PASSWORD}
       REDIS_HOST: ${REDIS_HOST}
       REDIS_PORT: ${REDIS_PORT}
+      INFURA_API_KEY: ${INFURA_API_KEY}
     depends_on:
       redis:
         condition: service_healthy

package.json

@@ -19,6 +19,7 @@
     "cookie": "^0.5.0",
     "cors": "^2.8.5",
     "dotenv": "^16.0.3",
+    "ethers": "^5.5.1",
     "express": "^4.18.2",
     "express-rate-limit": "^6.7.0",
     "express-session": "^1.17.3",

src/handlers/verify.ts

@@ -1,18 +1,19 @@
-import { Request, Response } from "express";
-import { ErrorTypes, SiweMessage } from "siwe";
-import { createOrUpdateUser } from "../services/prisma";
+import { Request, Response } from 'express';
+import { ErrorTypes, SiweMessage } from 'siwe';
+import { createOrUpdateUser } from '../services/prisma';
+import { ethers } from 'ethers';
+
+const provider = new ethers.providers.InfuraProvider('mainnet', process.env.INFURA_API_KEY);
 
 export const verifyAndSignIn = async (req: Request, res: Response) => {
   try {
     if (!req.body.message) {
-      res
-        .status(422)
-        .json({ message: "Expected prepareMessage object as body." });
+      res.status(422).json({ message: 'Expected prepareMessage object as body.' });
       return;
     }
 
     const message = new SiweMessage(req.body.message);
-    const fields = await message.validate(req.body.signature);
+    const fields = await message.validate(req.body.signature, provider);
     if (fields.nonce !== req.session.nonce) {
       res.status(422).json({
         message: `Invalid nonce.`,

terraform/ecs/main.tf

@@ -75,6 +75,7 @@ resource "aws_ecs_task_definition" "app_task_definition" {
         { name = "REDIS_PASSWORD", value = var.redis_password },
         { name = "REDIS_HOST", value = var.redis_host },
         { name = "REDIS_PORT", value = var.redis_port },
+        { name = "INFURA_API_KEY", value = var.infura_api_key },
       ],
       logConfiguration = {
         logDriver = "awslogs",

terraform/ecs/variables.tf

@@ -113,3 +113,9 @@ variable "redis_password" {
   type      = string
   sensitive = true
 }
+
+variable "infura_api_key" {
+  type      = string
+  sensitive = true
+}
+

terraform/main.tf

@@ -94,6 +94,7 @@ module "ecs" {
   redis_host          = var.redis_host
   redis_port          = var.redis_port
   redis_password      = var.redis_port
+  infura_api_key      = var.infura_api_key
 
   depends_on = [module.redis_global]
 }

terraform/variables.tf

@@ -65,3 +65,8 @@ variable "redis_password" {
   type      = string
   sensitive = true
 }
+
+variable "infura_api_key" {
+  type      = string
+  sensitive = true
+}