Recalculate final PVG with estimated gas limit values (#150)

pkg/client/client.go

@@ -162,17 +162,33 @@ func (i *Client) EstimateUserOperationGas(op map[string]any, ep string) (*gas.Ga
 	hash := userOp.GetUserOpHash(epAddr, i.chainID)
 	l = l.WithValues("userop_hash", hash)
 
+	// Estimate gas limits
 	vg, cg, err := i.getGasEstimate(epAddr, userOp)
 	if err != nil {
 		l.Error(err, "eth_estimateUserOperationGas error")
 		return nil, err
 	}
 
+	// Create a new op with updated gas limits
+	data, err := userOp.ToMap()
+	if err != nil {
+		l.Error(err, "eth_estimateUserOperationGas error")
+		return nil, err
+	}
+	data["verificationGasLimit"] = hexutil.EncodeBig(big.NewInt(int64(vg)))
+	data["callGasLimit"] = hexutil.EncodeBig(big.NewInt(int64(cg)))
+	userOp, err = userop.New(data)
+	if err != nil {
+		l.Error(err, "eth_estimateUserOperationGas error")
+		return nil, err
+	}
+
+	// Return gas values with a PVG calculation that takes into account updated gas limits.
 	l.Info("eth_estimateUserOperationGas ok")
 	return &gas.GasEstimates{
 		PreVerificationGas: gas.NewDefaultOverhead().CalcPreVerificationGas(userOp),
-		VerificationGas:    big.NewInt(int64(vg)),
-		CallGasLimit:       big.NewInt(int64(cg)),
+		VerificationGas:    userOp.VerificationGasLimit,
+		CallGasLimit:       userOp.CallGasLimit,
 	}, nil
 }