Merge branch 'staging' into patch-1

.github/workflows/develop-pipeline.yml

@@ -67,12 +67,15 @@ jobs:
           ARBITRUM_SEPOLIA_SCAN_API_KEY: ${{ secrets.ARBITRUM_SEPOLIA_SCAN_API_KEY }}
           BASE_SCAN_API_KEY: ${{ secrets.BASE_SCAN_API_KEY }}
           BASE_SEPOLIA_SCAN_API_KEY: ${{ secrets.BASE_SEPOLIA_SCAN_API_KEY }}
+          ZKEVM_MAINNET_SCAN_API_KEY: ${{ secrets.ZKEVM_MAINNET_SCAN_API_KEY }}
+          ZKEVM_CARDONA_SCAN_API_KEY: ${{ secrets.ZKEVM_CARDONA_SCAN_API_KEY }}
           MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }}
           ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }}
           SOLANA_TEST_NODE_RPC_URL: ${{ secrets.SOLANA_TEST_NODE_RPC_URL }}
           SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }}
           SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }}
           MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }}
+          GIV_POWER_SUBGRAPH_URL: ${{ secrets.GIV_POWER_SUBGRAPH_URL }}
 
   publish:
     needs: test

.github/workflows/master-pipeline.yml

@@ -104,13 +104,16 @@ jobs:
           ARBITRUM_SEPOLIA_SCAN_API_KEY: ${{ secrets.ARBITRUM_SEPOLIA_SCAN_API_KEY }}
           BASE_SCAN_API_KEY: ${{ secrets.BASE_SCAN_API_KEY }}
           BASE_SEPOLIA_SCAN_API_KEY: ${{ secrets.BASE_SEPOLIA_SCAN_API_KEY }}
+          ZKEVM_MAINNET_SCAN_API_KEY: ${{ secrets.ZKEVM_MAINNET_SCAN_API_KEY }}
+          ZKEVM_CARDONA_SCAN_API_KEY: ${{ secrets.ZKEVM_CARDONA_SCAN_API_KEY }}
           MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }}
           ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }}
           DROP_DATABASE: ${{ secrets.DROP_DATABASE_DURING_TEST_PROD }}
           SOLANA_TEST_NODE_RPC_URL: ${{ secrets.SOLANA_TEST_NODE_RPC_URL }}
           SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }}
           SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }}
           MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }}
+          GIV_POWER_SUBGRAPH_URL: ${{ secrets.GIV_POWER_SUBGRAPH_URL }}
 
   publish:
     needs: test

.github/workflows/staging-pipeline.yml

@@ -129,13 +129,16 @@ jobs:
           ARBITRUM_SEPOLIA_SCAN_API_KEY: ${{ secrets.ARBITRUM_SEPOLIA_SCAN_API_KEY }}
           BASE_SCAN_API_KEY: ${{ secrets.BASE_SCAN_API_KEY }}
           BASE_SEPOLIA_SCAN_API_KEY: ${{ secrets.BASE_SEPOLIA_SCAN_API_KEY }}
+          ZKEVM_MAINNET_SCAN_API_KEY: ${{ secrets.ZKEVM_MAINNET_SCAN_API_KEY }}
+          ZKEVM_CARDONA_SCAN_API_KEY: ${{ secrets.ZKEVM_CARDONA_SCAN_API_KEY }}
           MORDOR_ETC_TESTNET: ${{ secrets.MORDOR_ETC_TESTNET }}
           ETC_NODE_HTTP_URL: ${{ secrets.ETC_NODE_HTTP_URL }}
           DROP_DATABASE: ${{ secrets.DROP_DATABASE_DURING_TEST_STAGING }}
           SOLANA_TEST_NODE_RPC_URL: ${{ secrets.SOLANA_TEST_NODE_RPC_URL }}
           SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }}
           SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }}
           MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }}
+          GIV_POWER_SUBGRAPH_URL: ${{ secrets.GIV_POWER_SUBGRAPH_URL }}
 
   publish:
     needs: test

config/example.env

@@ -85,20 +85,11 @@ QF_ROUND_GOOGLE_SPREADSHEETS_PRIVATE_KEY=
 QF_ROUND_GOOGLE_SPREADSHEETS_CLIENT_EMAIL=
 QF_ROUND_DONATIONS_GOOGLE_SPREADSHEET_ID=
 
-POIGN_ART_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/dan13ram/poignart-rinkeby
-POIGN_ART_SERVICE_ACTIVE=true
-POIGN_ART_RECIPIENT_ADDRESS=0x10E1439455BD2624878b243819E31CfEE9eb721C
-POIGN_ART_ORIGIN_ADDRESS=
-SYNC_POIGN_ART_CRONJOB_EXPRESSION=0 1 * * * *
-
 CHANGE_API_KEYS=
 CHANGE_API_NON_PROFITS_SEARCH_URL=
 
 
 FRONTEND_URL=test.giveth.io
-DAPP_MAILER_URL=
-DAPP_MAILER_AUTHORIZATION_KEY=
-ENABLE_DAPP_MAILER=false
 
 GIVETH_IO_DAPP_BASE_URL=https://staging.giveth.io
 GIVETH_IO_BACKEND_BASE_URL=http://localhost:3040
@@ -318,3 +309,15 @@ BASE_MAINNET_NODE_HTTP_URL=
 
 # BASE SEPOLIA
 BASE_SEPOLIA_NODE_HTTP_URL=
+
+
+ZKEVM_MAINNET_SCAN_API_URL=https://api-zkevm.polygonscan.com/api
+ZKEVM_MAINET_SCAN_API_KEY=0000000000000000000000000000000000
+ZKEVM_CARDONA_SCAN_API_URL=https://api-cardona-zkevm.polygonscan.com/api
+ZKEVM_CARDONA_SCAN_API_KEY=0000000000000000000000000000000000
+
+# ZKEVM MAINNET we should fill it as Infura doesnt support polygon zkevm
+ZKEVM_MAINNET_NODE_HTTP_URL=
+
+# ZKEVM CARDONA  we should fill it as Infura doesnt support polygon zkevm
+ZKEVM_CARDONA_NODE_HTTP_URL=

config/test.env

@@ -82,11 +82,7 @@ GIVETH_GIV_PRICES_URL=https://givback.develop.giveth.io/givPrice
 PINATA_GATEWAY_ADDRESS=https://giveth.mypinata.cloud
 
 
-POIGN_ART_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/dan13ram/poignart-rinkeby
-POIGN_ART_SERVICE_ACTIVE=false
-POIGN_ART_RECIPIENT_ADDRESS=0x66f59a4181f43b96fe929b711476be15c96b83b3
-POIGN_ART_ORIGIN_ADDRESS=0x7a1dc1805f079a07ffd03845d3ec5b51ec8f9373
-SYNC_POIGN_ART_CRONJOB_EXPRESSION=0 0 0 * * *
+
 TRACE_FILE_UPLOADER_PASSWORD=hello_trace
 
 
@@ -103,9 +99,6 @@ PRIVATE_ETHERS_SECONDARY_TEST_KEY=0x2f8ca279705d6dfc44fb4507d02f6ef8bd0a50188695
 PUBLIC_ETHERS_SECONDARY_TEST_KEY=0x05fCFaDDFEc046F393B97C8273ad0537e83EFC74
 
 FRONTEND_URL=test.giveth.io
-DAPP_MAILER_URL=
-DAPP_MAILER_AUTHORIZATION_KEY=
-ENABLE_DAPP_MAILER=false
 
 GIVETH_IO_DAPP_BASE_URL=https://staging.giveth.io
 GIVETH_IO_BACKEND_BASE_URL=http://localhost:3040
@@ -129,7 +122,7 @@ GIVPOWER_ROUND_DURATION=1209600
 
 GIV_POWER_SUBGRAPH_ADAPTER=mock
 FIRST_GIVBACK_ROUND_TIME_STAMP=1640361600
-GIV_POWER_SUBGRAPH_URL=https://api.thegraph.com/subgraphs/name/giveth/giveth-economy-xdai-staging
+GIV_POWER_SUBGRAPH_URL=
 _GIV_POWER_SUBGRAPH_URL=http://localhost:8000/subgraphs/name/local/staging
 GIV_POWER_UNIPOOL_CONTRACT_ID=0xdaea66adc97833781139373df5b3bced3fdda5b1
 FILL_POWER_SNAPSHOT_BALANCE_SERVICE_ACTIVE=false
@@ -188,6 +181,10 @@ NUMBER_OF_BALANCE_AGGREGATOR_BATCH=7
 QF_ROUND_ESTIMATED_MATCHING_CACHE_DURATION=1
 # ! millisecond cache, if we increase cache in test ENV we might get some errors in tests
 PROJECT_CAMPAIGNS_CACHE_DURATION=1
+# ! millisecond cache, if we increase cache in test ENV we might get some errors in tests
+QF_ROUND_AND_MAIN_CATEGORIES_CACHE_DURATION=1
+# ! millisecond cache, if we increase cache in test ENV we might get some errors in tests
+REFRESH_ESTIMATED_MATCHING_CACHE_DURATION=1
 
 
 # OPTIONAL - default: *0 */5 *  * * ( Every 5 minutes)
@@ -242,3 +239,15 @@ DRAFT_RECURRING_DONATION_MATCH_EXPIRATION_HOURS=24
 OPTIMISTIC_SEPOLIA_SCAN_API_KEY=
 
 SUPER_FLUID_ADAPTER=superfluid
+
+
+
+ZKEVM_MAINNET_SCAN_API_URL=https://api-zkevm.polygonscan.com/api
+ZKEVM_MAINET_SCAN_API_KEY=0000000000000000000000000000000000
+ZKEVM_CARDONA_SCAN_API_URL=https://api-cardona-zkevm.polygonscan.com/api
+ZKEVM_CARDONA_SCAN_API_KEY=0000000000000000000000000000000000
+# ZKEVM MAINNET we should fill it as Infura doesnt support polygon zkevm, I found this rpc link from https://chainlist.org/chain/1101
+ZKEVM_MAINNET_NODE_HTTP_URL=https://polygon-zkevm.drpc.org
+
+# ZKEVM CARDONA  we should fill it as Infura doesnt support polygon zkevm, I found this rpc link from https://chainlist.org/chain/2442
+ZKEVM_CARDONA_NODE_HTTP_URL=https://rpc.cardona.zkevm-rpc.com

migration/1684654545845-add_some_mainnet_donations.ts

@@ -9,9 +9,9 @@ import {
 } from '../src/services/userService';
 import { findProjectById } from '../src/repositories/projectRepository';
 import { Project } from '../src/entities/project';
-import { updateTotalDonationsOfProject } from '../src/services/donationService';
 import { calculateGivbackFactor } from '../src/services/givbackService';
 import { AppDataSource } from '../src/orm';
+import { updateProjectStatistics } from '../src/services/projectService';
 
 const fromWalletAddress = '0x6bed0ce7be8dc307b69cfdc100f87db51bc3823a';
 const txHash =
@@ -257,7 +257,7 @@ export class addSomeMainnetDonations1684654545845
                 `);
       await updateUserTotalDonated(user.id);
       await updateUserTotalReceived(project.adminUser?.id);
-      await updateTotalDonationsOfProject(tx.projectId as number);
+      await updateProjectStatistics(tx.projectId as number);
     }
   }
 

migration/1696918830123-add_octant_donations_to_db.ts

@@ -9,9 +9,9 @@ import {
   updateUserTotalDonated,
   updateUserTotalReceived,
 } from '../src/services/userService';
-import { updateTotalDonationsOfProject } from '../src/services/donationService';
 import { Donation } from '../src/entities/donation';
 import { NETWORK_IDS } from '../src/provider';
+import { updateProjectStatistics } from '../src/services/projectService';
 
 const octantDonationTxHash =
   '0xe70a8ee39511d3c186ea53c4bdd9fcd34f658d68ca7e1bbbc2b231630ac7fa3b';
@@ -108,7 +108,7 @@ export class addOctantDonationsToDb1696918830123 implements MigrationInterface {
                 `);
       await updateUserTotalDonated(user.id);
       await updateUserTotalReceived(project.adminUser?.id);
-      await updateTotalDonationsOfProject(tx.projectId as number);
+      await updateProjectStatistics(tx.projectId as number);
     }
   }
 

migration/1703398409668-add_missed_op_donations_to_db.ts

@@ -9,10 +9,10 @@ import {
   updateUserTotalDonated,
   updateUserTotalReceived,
 } from '../src/services/userService';
-import { updateTotalDonationsOfProject } from '../src/services/donationService';
 import { Donation } from '../src/entities/donation';
 import { NETWORK_IDS } from '../src/provider';
 import { refreshProjectEstimatedMatchingView } from '../src/services/projectViewsService';
+import { updateProjectStatistics } from '../src/services/projectService';
 
 const QF_ROUND_ID = 5;
 const millisecondTimestampToDate = (timestamp: number): Date => {
@@ -271,7 +271,7 @@ export class addMissedOpDonationsToDb1703398409668
 
       await updateUserTotalDonated(user.id);
       await updateUserTotalReceived(project.adminUser?.id);
-      await updateTotalDonationsOfProject(tx.projectId as number);
+      await updateProjectStatistics(tx.projectId as number);
     }
 
     await refreshProjectEstimatedMatchingView();