Remove third-web related code

GeneralMagicio · Sep 15, 2024 · 251db3e · 251db3e
1 parent be24a6a
commit 251db3e
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 2,447 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "siwe": "^2.3.2",
-    "thirdweb": "^5.15.0"
+    "viem": "^2.21.5"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.0.0",

diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
@@ -9,8 +9,6 @@ import {
   Req,
   UseGuards,
   UnprocessableEntityException,
-  BadRequestException,
-  ForbiddenException,
 } from '@nestjs/common';
 
 import { AuthService } from './auth.service';
@@ -23,7 +21,6 @@ import { ApiResponse } from '@nestjs/swagger';
 import { AuthedReq } from 'src/utils/types/AuthedReq.type';
 import { STAGING_API, generateRandomString } from 'src/utils';
 import { FlowService } from 'src/flow/flow.service';
-import { OtpDTO } from './dto/otp.dto';
 
 @Controller({ path: 'auth' })
 export class AuthController {
@@ -63,12 +60,18 @@ export class AuthController {
 
   @ApiResponse({ status: 200, description: 'Sets an auth cookie' })
   @Post('/login')
-  async login(@Res() res: Response, @Body() { message, signature }: LoginDTO) {
+  async login(
+    @Res() res: Response,
+    @Body() { message, signature, address }: LoginDTO,
+  ) {
     let isNewUser = false;
-    const isAuthentic = await this.authService.verifyUser(message, signature);
+    const isAuthentic = await this.authService.verifyUser(
+      message,
+      signature as `0x${string}`,
+      address as `0x${string}`,
+    );
     if (!isAuthentic) throw new UnauthorizedException('Invalid signature');
 
-    const { address } = message;
     let user = await this.prismaService.user.findFirst({
       where: { address },
     });

diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -1,14 +1,8 @@
-import {
-  ForbiddenException,
-  Injectable,
-  InternalServerErrorException,
-  Logger,
-} from '@nestjs/common';
-import { verifySignature } from 'thirdweb/auth';
+import { Injectable, Logger } from '@nestjs/common';
 import { generateRandomString } from 'src/utils';
 import { PrismaService } from 'src/prisma.service';
-import { ethers } from 'ethers';
 import { SiweMessage } from 'siwe';
+import { verifyMessage } from 'viem';
 // import { chain, thirdwebClient } from 'src/thirdweb';
 
 @Injectable()
@@ -146,12 +140,19 @@ export class AuthService {
     return user;
   };
 
-  verifyUser = async (message: SiweMessage, signature: any) => {
-    const siweMessage = new SiweMessage(message);
+  verifyUser = async (
+    message: string,
+    signature: `0x${string}`,
+    address: `0x${string}`,
+  ) => {
     try {
       // await this.isNonceValid(message.nonce);
-      await siweMessage.verify({ signature });
-      return true;
+      const valid = await verifyMessage({
+        address,
+        message,
+        signature,
+      });
+      return valid;
     } catch (err) {
       return false;
     }

diff --git a/src/auth/dto/login.dto.ts b/src/auth/dto/login.dto.ts
@@ -77,9 +77,12 @@ export class SiweMessageClass {
 }
 
 export class LoginDTO {
-  @ApiProperty({ type: SiweMessageClass })
-  message: SiweMessage;
+  @ApiProperty()
+  message: string;
 
   @ApiProperty()
   signature: string;
+
+  @ApiProperty()
+  address: string;
 }
diff --git a/src/thirdweb/index.ts b/src/thirdweb/index.ts
diff --git a/src/weighted-api/eas/eas.ts b/src/weighted-api/eas/eas.ts
@@ -1,4 +1,3 @@
-import { optimismSepolia } from 'thirdweb/chains';
 import { type Address } from 'viem';
 
 export type EASConfig = {
@@ -20,12 +19,12 @@ export const EASNetworks: Record<number, Config> = {
     gqlUrl: 'https://optimism.easscan.org/graphql',
   },
   // Optimism Sepolia
-  [optimismSepolia.id]: {
-    EASDeployment: '0x4200000000000000000000000000000000000021',
-    SchemaRegistry: '0x4200000000000000000000000000000000000020',
-    explorer: `https://optimism-sepolia.blockscout.com`,
-    gqlUrl: 'https://optimism-sepolia.easscan.org/graphql',
-  },
+  // [optimismSepolia.id]: {
+  //   EASDeployment: '0x4200000000000000000000000000000000000021',
+  //   SchemaRegistry: '0x4200000000000000000000000000000000000020',
+  //   explorer: `https://optimism-sepolia.blockscout.com`,
+  //   gqlUrl: 'https://optimism-sepolia.easscan.org/graphql',
+  // },
 };
 
 export const SCHEMA_UID = process.env.SCHEMA_UID;
diff --git a/src/weighted-api/main.ts b/src/weighted-api/main.ts
@@ -15,11 +15,12 @@ import {
   initializeWeightList,
   sortWeightedList,
 } from './utils';
-import { chain } from 'src/thirdweb';
+// import { chain } from 'src/thirdweb';
 import { getRankingDistribution } from './algo';
 import axios from 'axios';
 import { BadgeData } from 'src/utils/badges/readBadges';
 
+const chain = { id: 10 };
 const readAllAttestations = async () => {
   if (!SCHEMA_UID) throw Error('Please enter an schema UID');
   const attestations = await getAllAttestations(

diff --git a/src/weighted-api/user-based.ts b/src/weighted-api/user-based.ts
@@ -15,11 +15,12 @@ import {
   initializeWeightList,
   sortWeightedList,
 } from './utils';
-import { chain } from 'src/thirdweb';
+// import { chain } from 'src/thirdweb';
 import { getRankingDistribution } from './algo';
 import axios from 'axios';
 import { BadgeData } from 'src/utils/badges/readBadges';
 
+const chain = { id: 10 };
 const readAllAttestations = async (address: string) => {
   if (!SCHEMA_UID) throw Error('Please enter an schema UID');
   const attestations = await getAllAttestations(