Merge branch 'master' into staging

config/example.env

@@ -269,4 +269,5 @@ NUMBER_OF_UPDATE_RECURRING_DONATION_CONCURRENT_JOB=1
 # Default value is 0 0 * * * that means one day at 00:00
 UPDATE_RECURRING_DONATIONS_STREAM=0 0 * * *
 
-MPETH_GRAPHQL_PRICES_URL=
+MPETH_GRAPHQL_PRICES_URL=
+MPETH_GRAPHQL_PRICES_URL=

src/services/cronJobs/importLostDonationsJob.ts

@@ -32,6 +32,7 @@ abiDecoder.addABI(erc20ABI);
 
 const QF_ROUND_ID = config.get('LOST_DONATIONS_QF_ROUND');
 const NETWORK_ID = config.get('LOST_DONATIONS_NETWORK_ID');
+const NATIVE_NETWORK_TOKEN = config.get('LOST_DONATIONS_NATIVE_NETWORK_TOKEN');
 
 const cronJobTime =
   (config.get('IMPORT_LOST_DONATIONS_CRONJOB_EXPRESSION') as string) ||
@@ -140,7 +141,7 @@ export const importLostDonations = async () => {
         ) {
           // it's an eth transfer native token
           const nativeToken = await Token.createQueryBuilder('token')
-            .where(`token.id = 198`)
+            .where(`token.id = :token`, { token: NATIVE_NETWORK_TOKEN })
             .getOne();
 
           tokenInDB = nativeToken;
@@ -213,6 +214,7 @@ export const importLostDonations = async () => {
             toWalletAddress: donationParams.to.toLowerCase(),
             transactionId: tx.toLowerCase(),
             projectId: project.id,
+            userId: dbUser.id,
             currency: donationParams.currency,
             tokenAddress: tokenInDB?.address,
             amount: donationParams.amount,
@@ -238,13 +240,15 @@ export const importLostDonations = async () => {
         } catch (e) {
           logger.debug('Error saving donation for for tx: ', tx);
           logger.debug('Error saving donation: ', e);
+          continue;
         }
 
         await updateUserTotalDonated(dbUser.id);
         await updateUserTotalReceived(project.adminUser?.id);
         await updateTotalDonationsOfProject(project.id);
       } catch (e) {
         logger.error('importLostDonations() error');
+        continue;
       }
     }