Merge pull request #51 from Giveth/47_remove_solana_addresses

Remove solana donations from calculation
Giveth · Mar 17, 2024 · dad9f35 · dad9f35
2 parents 3a02807 + 9f5fa09
commit dad9f35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/givethIoService.ts b/src/givethIoService.ts
@@ -94,6 +94,7 @@ export const getEligibleDonations = async (
             transactionNetworkId
             amount
             givbackFactor
+            chainType
             isProjectVerified
             projectRank
             powerRound
@@ -126,6 +127,7 @@ export const getEligibleDonations = async (
           moment(donation.createdAt) < secondDate
           && moment(donation.createdAt) > firstDate
           && donation.valueUsd
+          && donation.chainType == 'EVM'
           && donation.isProjectVerified
           && donation.status === 'verified'
       )
@@ -136,6 +138,7 @@ export const getEligibleDonations = async (
           moment(donation.createdAt) < secondDate
           && moment(donation.createdAt) > firstDate
           && donation.valueUsd
+          && donation.chainType == 'EVM'
           && !donation.isProjectVerified
           && donation.status === 'verified'
       )
@@ -276,6 +279,7 @@ export const getVerifiedPurpleListDonations = async (beginDate: string, endDate:
             transactionId
             transactionNetworkId
             amount
+            chainType
             isProjectVerified
             project {
               slug
@@ -299,6 +303,7 @@ export const getVerifiedPurpleListDonations = async (beginDate: string, endDate:
           moment(donation.createdAt) < secondDate
           && moment(donation.createdAt) > firstDate
           && donation.valueUsd
+          && donation.chainType == 'EVM'
           && donation.isProjectVerified
           && donation.status === 'verified'
       )

diff --git a/src/swagger.json b/src/swagger.json
@@ -400,7 +400,7 @@
             "type": "string",
             "description": "If you want to see json here set no, but if you want to download a file set yes",
             "default": "no",
-            "enum": ["yes","no"],
+            "enum": ["no", "optimism","all-other-chains", "NICE" ],
             "in": "query"
           }
         ],

diff --git a/src/types/general.ts b/src/types/general.ts
@@ -39,6 +39,7 @@ export interface GivethIoDonation {
     transactionNetworkId: number,
     fromWalletAddress: string,
     toWalletAddress: string
+    chainType: string
     source: string,
     user: {
         name: string,