Merge pull request #23 from Giveth/staging

Fix the fee estimation difference

Author: ae2079

src/config/production.ts

@@ -27,8 +27,8 @@ export const productionConfig: AppConfig = {
       givgarden: 5, // 5% for GIVgarden
       projects: 92, // 92% for projects
     },
-    distributionBalanceThreshold: 100, // Balance threshold for 100% distribution
-    distributionPercentage: 5, // Percentage for standard distribution
+    distributionBalanceThreshold: 10, // Balance threshold for 100% distribution
+    distributionPercentage: 1, // Percentage for standard distribution
     minBalanceForDistribution: 0.1, // Minimum balance for distribution
   },
   feeRefiller: {

src/services/donation-handler.service.ts

@@ -230,6 +230,7 @@ export class DonationHandlerService {
                 gasLimit: gasLimit,
             };
 
+            console.log(`Sending single donation transaction with gas limit: ${gasLimit.toString()}`);
             const result = await this.transactionService.sendTransaction(transactionRequest, walletInfo.hdPath);
 
             console.log(`✅ Single donation transaction successful: ${result.transactionHash}`);
@@ -359,6 +360,7 @@ export class DonationHandlerService {
                 gasLimit: gasLimit,
             };
 
+            console.log(`Sending batch donation transaction with gas limit: ${gasLimit.toString()}`);
             const result = await this.transactionService.sendTransaction(transactionRequest, walletInfo.hdPath);
 
             console.log(`✅ Batch donation transaction successful: ${result.transactionHash}`);

src/services/transaction.service.ts

@@ -117,10 +117,21 @@ export class TransactionService {
 
       console.log(`Estimated transaction fee: ${feeEstimate.estimatedFeeInPOL} POL`);
 
-      // Ensure wallet has sufficient balance for fees
+      // Determine the actual gas limit that will be used
+      const actualGasLimit = request.gasLimit || feeEstimate.gasLimit;
+      
+      // If a custom gas limit is provided, recalculate the fee using the actual gas limit
+      let actualTotalFee = feeEstimate.totalFee;
+      if (request.gasLimit && request.gasLimit !== feeEstimate.gasLimit) {
+        // Recalculate fee with the actual gas limit that will be used
+        actualTotalFee = actualGasLimit * feeEstimate.gasPrice;
+        console.log(`Custom gas limit provided. Recalculated fee: ${ethers.formatEther(actualTotalFee)} POL (Gas: ${actualGasLimit.toString()}, Price: ${ethers.formatUnits(feeEstimate.gasPrice, 'gwei')} gwei)`);
+      }
+
+      // Ensure wallet has sufficient balance for fees using the actual fee
       const refillResult = await this.feeRefillerService.ensureSufficientBalance(
         request.from,
-        feeEstimate.totalFee
+        actualTotalFee
       );
 
       if (!refillResult.success) {
@@ -132,7 +143,7 @@ export class TransactionService {
         to: request.to as `0x${string}`,
         data: request.data as `0x${string}`,
         value: request.value ? ethers.parseEther(request.value) : 0n,
-        gasLimit: request.gasLimit || feeEstimate.gasLimit, // Use custom gas limit if provided
+        gasLimit: actualGasLimit,
         gasPrice: feeEstimate.gasPrice,
         nonce: nonce // Explicit nonce to prevent conflicts
       };