Vouched projects and superfluid Base improvements

migration/1728554628004-AddEstimatedClusterMatching.ts

@@ -0,0 +1,34 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddEstimatedClusterMatching1728554628004
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            CREATE TABLE estimated_cluster_matching (
+              id SERIAL PRIMARY KEY,
+              "projectId" INT NOT NULL,
+              "qfRoundId" INT NOT NULL,
+              matching DOUBLE PRECISION NOT NULL
+            );
+          `);
+
+    // Create indexes on the new table
+    await queryRunner.query(`
+            CREATE INDEX estimated_cluster_matching_project_id_qfround_id
+            ON estimated_cluster_matching ("projectId", "qfRoundId");
+          `);
+
+    await queryRunner.query(`
+            CREATE INDEX estimated_cluster_matching_matching
+            ON estimated_cluster_matching (matching);
+          `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Revert changes if necessary by dropping the table and restoring the view
+    await queryRunner.query(`
+        DROP TABLE IF EXISTS estimated_cluster_matching;
+      `);
+  }
+}

migration/data/seedTokens.ts

@@ -1695,6 +1695,16 @@ const seedTokens: ITokenData[] = [
     coingeckoId: 'degen-base',
     isGivbackEligible: false,
   },
+  // cbBTC - https://basescan.org/token/0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf
+  {
+    name: 'Coinbase Wrapped BTC',
+    symbol: 'cbBTC',
+    address: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    decimals: 8,
+    networkId: NETWORK_IDS.BASE_MAINNET,
+    coingeckoId: 'coinbase-wrapped-btc',
+    isGivbackEligible: false,
+  },
   // Osaka Protocol - https://basescan.org/token/0xbFd5206962267c7b4b4A8B3D76AC2E1b2A5c4d5e
   {
     name: 'Osaka Protocol',

package.json

@@ -136,6 +136,7 @@
     "test:qfRoundService": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/services/qfRoundService.test.ts",
     "test:project": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/entities/project.test.ts",
     "test:projectsTab": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/server/adminJs/tabs/projectsTab.test.ts",
+    "test:projectVerificationTab": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/server/adminJs/tabs/projectVerificationTab.test.ts",
     "test:syncUsersModelScore": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/services/cronJobs/syncUsersModelScore.test.ts",
     "test:notifyDonationsWithSegment": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/services/cronJobs/notifyDonationsWithSegment.test.ts",
     "test:checkProjectVerificationStatus": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/services/cronJobs/checkProjectVerificationStatus.test.ts",

src/adapters/adaptersFactory.ts

@@ -22,6 +22,9 @@ import { DonationSaveBackupMockAdapter } from './donationSaveBackup/DonationSave
 import { SuperFluidAdapter } from './superFluid/superFluidAdapter';
 import { SuperFluidMockAdapter } from './superFluid/superFluidMockAdapter';
 import { SuperFluidAdapterInterface } from './superFluid/superFluidAdapterInterface';
+import { CocmAdapter } from './cocmAdapter/cocmAdapter';
+import { CocmMockAdapter } from './cocmAdapter/cocmMockAdapter';
+import { CocmAdapterInterface } from './cocmAdapter/cocmAdapterInterface';
 
 const discordAdapter = new DiscordAdapter();
 const googleAdapter = new GoogleAdapter();
@@ -147,3 +150,17 @@ export const getSuperFluidAdapter = (): SuperFluidAdapterInterface => {
       return superFluidMockAdapter;
   }
 };
+
+const clusterMatchingAdapter = new CocmAdapter();
+const clusterMatchingMockAdapter = new CocmMockAdapter();
+
+export const getClusterMatchingAdapter = (): CocmAdapterInterface => {
+  switch (process.env.CLUSTER_MATCHING_ADAPTER) {
+    case 'clusterMatching':
+      return clusterMatchingAdapter;
+    case 'mock':
+      return clusterMatchingMockAdapter;
+    default:
+      return clusterMatchingMockAdapter;
+  }
+};

src/adapters/cocmAdapter/cocmAdapter.ts

@@ -0,0 +1,46 @@
+import axios from 'axios';
+import {
+  CocmAdapterInterface,
+  EstimatedMatchingInput,
+  ProjectsEstimatedMatchings,
+} from './cocmAdapterInterface';
+import { logger } from '../../utils/logger';
+import { i18n, translationErrorMessagesKeys } from '../../utils/errorMessages';
+
+export class CocmAdapter implements CocmAdapterInterface {
+  private ClusterMatchingURL;
+
+  constructor() {
+    this.ClusterMatchingURL =
+      process.env.CLUSTER_MATCHING_API_URL || 'localhost';
+  }
+
+  async fetchEstimatedClusterMatchings(
+    matchingDataInput: EstimatedMatchingInput,
+  ): Promise<ProjectsEstimatedMatchings> {
+    try {
+      const result = await axios.post(
+        this.ClusterMatchingURL,
+        matchingDataInput,
+        {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+      if (result?.data?.error !== null) {
+        logger.error('clusterMatchingApi error', result.data.error);
+        throw new Error(
+          i18n.__(translationErrorMessagesKeys.CLUSTER_MATCHING_API_ERROR),
+        );
+      }
+      return result.data;
+    } catch (e) {
+      logger.error('clusterMatchingApi error', e);
+      throw new Error(
+        i18n.__(translationErrorMessagesKeys.CLUSTER_MATCHING_API_ERROR),
+      );
+    }
+  }
+}

src/adapters/cocmAdapter/cocmAdapterInterface.ts

@@ -0,0 +1,49 @@
+// Example Data
+// {
+// 	"matching_data": [
+// 		{
+// 			"matching_amount": 83.25,
+// 			"matching_percent": 50.0,
+// 			"project_name": "Test1",
+// 			"strategy": "COCM"
+// 		},
+// 		{
+// 			"matching_amount": 83.25,
+// 			"matching_percent": 50.0,
+// 			"project_name": "Test3",
+// 			"strategy": "COCM"
+// 		}
+// 	]
+// }
+
+export interface ProjectsEstimatedMatchings {
+  matching_data: {
+    matching_amount: number;
+    matching_percent: number;
+    project_name: string;
+    strategy: string;
+  }[];
+}
+
+export interface EstimatedMatchingInput {
+  votes_data: [
+    {
+      voter: string;
+      payoutAddress: string;
+      amountUSD: number;
+      project_name: string;
+      score: number;
+    },
+  ];
+  strategy: string;
+  min_donation_threshold_amount: number;
+  matching_cap_amount: number;
+  matching_amount: number;
+  passport_threshold: number;
+}
+
+export interface CocmAdapterInterface {
+  fetchEstimatedClusterMatchings(
+    matchingDataInput: EstimatedMatchingInput,
+  ): Promise<ProjectsEstimatedMatchings>;
+}

src/adapters/cocmAdapter/cocmMockAdapter.ts

@@ -0,0 +1,27 @@
+import {
+  CocmAdapterInterface,
+  ProjectsEstimatedMatchings,
+} from './cocmAdapterInterface';
+
+export class CocmMockAdapter implements CocmAdapterInterface {
+  async fetchEstimatedClusterMatchings(
+    _matchingDataInput,
+  ): Promise<ProjectsEstimatedMatchings> {
+    return {
+      matching_data: [
+        {
+          matching_amount: 83.25,
+          matching_percent: 50.0,
+          project_name: 'Test1',
+          strategy: 'COCM',
+        },
+        {
+          matching_amount: 83.25,
+          matching_percent: 50.0,
+          project_name: 'Test3',
+          strategy: 'COCM',
+        },
+      ],
+    };
+  }
+}

src/adapters/oauth2/linkedinAdapter.ts

@@ -19,7 +19,7 @@ export class LinkedinAdapter implements SocialNetworkOauth2AdapterInterface {
      */
 
     // https://docs.microsoft.com/en-us/linkedin/shared/authentication/getting-access?context=linkedin%2Fcontext#open-permissions-consumer
-    const scope = 'r_liteprofile';
+    const scope = 'openid profile email';
     return `https://www.linkedin.com/oauth/v2/authorization?client_id=${clientId}&redirect_uri=${redirectUrl}&response_type=code&scope=${scope}&state=${trackId}`;
   }
 
@@ -57,50 +57,32 @@ export class LinkedinAdapter implements SocialNetworkOauth2AdapterInterface {
       const accessToken = result.data.access_token;
 
       /**
-       * @see {@link https://docs.microsoft.com/en-us/linkedin/consumer/integrations/self-serve/sign-in-with-linkedin?context=linkedin%2Fconsumer%2Fcontext#api-request}
-       */
-      const meResult = await axios.get('https://api.linkedin.com/v2/me', {
+      @see {@link https://learn.microsoft.com/en-us/linkedin/consumer/integrations/self-serve/sign-in-with-linkedin-v2?context=linkedin%2Fconsumer%2Fcontext#api-request-to-retreive-member-details}
+      */
+      const meResult = await axios.get('https://api.linkedin.com/v2/userinfo', {
         headers: {
           Authorization: `Bearer ${accessToken}`,
         },
       });
+
       /**
-       * sample response
-           {
-               "id":"REDACTED",
-               "firstName":{
-                  "localized":{
-                     "en_US":"Tina"
-                  },
-                  "preferredLocale":{
-                     "country":"US",
-                     "language":"en"
-                  }
-               },
-               "lastName":{
-                  "localized":{
-                     "en_US":"Belcher"
-                  },
-                  "preferredLocale":{
-                     "country":"US",
-                     "language":"en"
-                  }
-               },
-                "profilePicture": {
-                    "displayImage": "urn:li:digitalmediaAsset:B54328XZFfe2134zTyq"
-                }
-           }
+       * New Sample response
+       * {
+       *   "sub": "782bbtaQ",
+       *   "name": "John Doe",
+       *   "given_name": "John",
+       *   "family_name": "Doe",
+       *   "picture": "https://media.licdn-ei.com/dms/image/C5F03AQHqK8v7tB1HCQ/profile-displayphoto-shrink_100_100/0/",
+       *   "locale": "en-US",
+       *   "email": "[email protected]",
+       *   "email_verified": true
+       * }
        */
-      const username = meResult.data.id;
-      let name = username;
-      if (
-        meResult.data?.firstName?.localized?.en_US ||
-        meResult.data?.lastName?.localized?.en_US
-      ) {
-        name = `${meResult.data?.firstName?.localized?.en_US || ''} ${
-          meResult.data?.lastName?.localized?.en_US || ''
-        }`.trim();
-      }
+      const username = meResult.data.sub;
+
+      const name =
+        meResult.data.name ||
+        `${meResult.data.given_name || ''} ${meResult.data.family_name || ''}`.trim();
       return {
         username,
         name,

src/adapters/superFluid/superFluidAdapter.ts

@@ -1,19 +1,33 @@
 import axios from 'axios';
 import { logger } from '../../utils/logger';
-import { isProduction } from '../../utils/utils';
 import {
   FlowUpdatedEvent,
   SuperFluidAdapterInterface,
 } from './superFluidAdapterInterface';
+import { NETWORK_IDS } from '../../provider';
 
-const superFluidGraphqlUrl =
+const superFluidGraphqlPolygonUrl =
   'https://subgraph-endpoints.superfluid.dev/optimism-mainnet/protocol-v1';
-const superFluidGraphqlStagingUrl =
+const superFluidGraphqlPolygonStagingUrl =
   'https://optimism-sepolia.subgraph.x.superfluid.dev';
+const superFluidGraphBaseUrl =
+  'https://subgraph-endpoints.superfluid.dev/base-mainnet/protocol-v1';
 
-const subgraphUrl = isProduction
-  ? superFluidGraphqlUrl
-  : superFluidGraphqlStagingUrl;
+const subgraphUrlMap = {
+  [NETWORK_IDS.OPTIMISTIC]: superFluidGraphqlPolygonUrl,
+  [NETWORK_IDS.OPTIMISM_SEPOLIA]: superFluidGraphqlPolygonStagingUrl,
+  [NETWORK_IDS.BASE_MAINNET]: superFluidGraphBaseUrl,
+  [NETWORK_IDS.BASE_SEPOLIA]: superFluidGraphBaseUrl,
+};
+
+// Function to retrieve the subgraph URL for a given network ID
+const getSubgraphUrl = (networkId: number) => {
+  const url = subgraphUrlMap[networkId];
+  if (!url) {
+    throw new Error(`No subgraph URL found for network ID: ${networkId}`);
+  }
+  return url;
+};
 
 // Define your GraphQL query as a string and prepare your variables
 const accountQuery = `
@@ -169,8 +183,9 @@ export class SuperFluidAdapter implements SuperFluidAdapterInterface {
     */
 
   // Optimism works
-  async accountBalance(accountId: string) {
+  async accountBalance(accountId: string, networkId: number) {
     try {
+      const subgraphUrl = getSubgraphUrl(networkId);
       const response = await axios.post(subgraphUrl, {
         query: accountQuery,
         variables: {
@@ -189,12 +204,21 @@ export class SuperFluidAdapter implements SuperFluidAdapterInterface {
     sender: string;
     flowRate: string;
     transactionHash: string;
+    networkId: number;
   }): Promise<FlowUpdatedEvent | undefined> {
     try {
+      const subgraphUrl = getSubgraphUrl(params.networkId);
+      const whereParams = {
+        receiver: params.receiver,
+        sender: params.sender,
+        flowRate: params.flowRate,
+        transactionHash: params.transactionHash,
+      };
+
       const response = await axios.post(subgraphUrl, {
         query: getFlowsQuery,
         variables: {
-          where: params,
+          where: whereParams,
           orderBy: 'timestamp',
           orderDirection: 'asc',
         },
@@ -213,14 +237,24 @@ export class SuperFluidAdapter implements SuperFluidAdapterInterface {
     sender: string;
     flowRate: string;
     timestamp_gt: number;
+    networkId: number;
   }): Promise<FlowUpdatedEvent | undefined> {
     try {
+      const subgraphUrl = getSubgraphUrl(params.networkId);
+
       logger.debug('getFlowByReceiverSenderFlowRate has been called', params);
 
+      const whereParams = {
+        receiver: params.receiver,
+        sender: params.sender,
+        flowRate: params.flowRate,
+        timestamp_gt: params.timestamp_gt,
+      };
+
       const response = await axios.post(subgraphUrl, {
         query: getFlowsQuery,
         variables: {
-          where: params,
+          where: whereParams,
           orderBy: 'timestamp',
           orderDirection: 'asc',
         },