fix: pvg calculation

tct68 · May 19, 2023 · 86c169d · 86c169d
1 parent f83b579
commit 86c169d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/lib/models/gas.dart b/lib/models/gas.dart
@@ -18,4 +18,16 @@ class GasEstimate {
     this.l1GasUsed = l1GasUsed ?? BigInt.zero;
     this.l1BaseFee = l1BaseFee ?? BigInt.zero;
   }
+
+  GasEstimate copy() {
+    return GasEstimate(
+      callGasLimit: callGasLimit,
+      preVerificationGas: preVerificationGas,
+      verificationGasLimit: verificationGasLimit,
+      maxPriorityFeePerGas: maxPriorityFeePerGas,
+      maxFeePerGas: maxFeePerGas,
+      l1GasUsed: l1GasUsed,
+      l1BaseFee: l1BaseFee,
+    );
+  }
 }
diff --git a/lib/models/gas_estimators/l1_gas_estimator.dart b/lib/models/gas_estimators/l1_gas_estimator.dart
@@ -49,7 +49,7 @@ class L1GasEstimator extends GasEstimator {
       gasEstimate.maxFeePerGas = BigInt.from(networkFees[0]);
       gasEstimate.maxPriorityFeePerGas = BigInt.from(networkFees[1]);
     }else{
-      gasEstimate = prevEstimate;
+      gasEstimate = prevEstimate.copy();
     }
     if (includesPaymaster){
       gasEstimate.preVerificationGas += BigInt.from(84); // To accommodate for GnosisTransaction.approveAmount which would be 0 before estimation

diff --git a/lib/models/gas_estimators/l2_gas_estimator.dart b/lib/models/gas_estimators/l2_gas_estimator.dart
@@ -40,7 +40,7 @@ class L2GasEstimator extends GasEstimator {
       gasEstimate.maxFeePerGas = BigInt.from(networkFees[0]);
       gasEstimate.maxPriorityFeePerGas = BigInt.from(networkFees[1]);
     }else{
-      gasEstimate = prevEstimate;
+      gasEstimate = prevEstimate.copy();
     }
     //
     if (gasEstimate.l1GasUsed == BigInt.zero){

diff --git a/lib/models/paymaster/fee_token.dart b/lib/models/paymaster/fee_token.dart
@@ -13,7 +13,7 @@ class FeeCurrencyUtils {
   static final BigInt costOfPost = BigInt.from(45000); // todo shouldn't be hardcoded
 
   static BigInt calculateFee(UserOperation op, BigInt exchangeRate, bool isEther) {
-    BigInt operationMaxEthCostUsingPaymaster = op.maxFeePerGas * (costOfPost + op.callGasLimit + (op.verificationGasLimit * BigInt.from(isEther ? 1 : 1)) + op.preVerificationGas);
+    BigInt operationMaxEthCostUsingPaymaster = op.maxFeePerGas * (costOfPost + op.callGasLimit + (op.verificationGasLimit * BigInt.from(isEther ? 1 : 3)) + op.preVerificationGas);
     BigInt tokenToEthPrice = (operationMaxEthCostUsingPaymaster * exchangeRate) ~/ BigInt.from(10).pow(18);
     return tokenToEthPrice;
   }