rpcserver: AddInvoice uses new helper methods for satsMode

Author: GeorgeTsagk

rpcserver.go

@@ -7707,54 +7707,40 @@ func (r *rpcServer) AddInvoice(ctx context.Context,
 	// will help us establish a quote with the correct amount of asset
 	// units.
 	if satsMode {
-		oracleRes, err := r.cfg.PriceOracle.QueryBidPrice(
-			ctx, specifier, fn.None[uint64](), fn.Some(amtMsat),
-			fn.None[rfqmsg.AssetRate](),
+		maxUnits, err = rfq.EstimateAssetUnits(
+			ctx, r.cfg.PriceOracle, specifier, amtMsat,
 		)
 		if err != nil {
 			return nil, err
 		}
 
-		if oracleRes.Err != nil {
-			return nil, fmt.Errorf("cannot query oracle: %v",
-				oracleRes.Err.Error())
-		}
+		maxMathUnits := rfqmath.NewBigIntFromUint64(maxUnits)
 
-		assetUnits := rfqmath.MilliSatoshiToUnits(
-			amtMsat, oracleRes.AssetRate.Rate,
+		tolerance := rfqmath.NewBigIntFromUint64(
+			r.cfg.RfqManager.GetPriceDeviationPpm(),
 		)
 
-		maxUnits = assetUnits.ToUint64()
+		// Since we used a different oracle price query above to
+		// calculate the max amount of units, we want to add some
+		// breathing room to account for price fluctuations caused by
+		// the small time delay, plus the fact that the agreed upon
+		// quote may be different. If we don't add this safety window
+		// the peer may allow a routable amount that evaluates to less
+		// than what we ask for. This is also checked below, after
+		// acquiring the quote.
+
+		// Apply the tolerance margin twice. Once due to the ask/bid
+		// price deviation that may occur during rfq negotiation, and
+		// once for the price movement that may occur between querying
+		// the oracle and acquiring the quote. We don't really care
+		// about this margin being too big, this only affects the max
+		// units our peer agrees to route.
+		maxMathUnits = rfqmath.AddTolerance(maxMathUnits, tolerance)
+		maxMathUnits = rfqmath.AddTolerance(maxMathUnits, tolerance)
+
+		maxUnits = maxMathUnits.ToUint64()
 	}
 
-	// Since we used a different oracle price query above calculate the max
-	// amount of units, we want to add some breathing room to account for
-	// price fluctuations caused by the small time delay, plus the fact that
-	// the agreed upon quote may be different. If we don't add this safety
-	// window the peer may allow a routable amount that evaluates to less
-	// than what we ask for.
-	tolerance := rfqmath.NewBigIntFromUint64(
-		r.cfg.RfqManager.GetPriceDeviationPpm(),
-	)
-
-	// Parse the max asset units to the rfqmath type.
-	maxMathUnits := rfqmath.NewBigIntFromUint64(maxUnits)
-
-	// Calculate the tolerance margin.
-	toleranceUnits := maxMathUnits.Mul(tolerance).Div(
-		rfqmath.NewBigIntFromUint64(1_000_000),
-	)
-
-	// Apply the tolerance margin twice. Once due to the ask/bid price
-	// deviation that may occur during rfq negotiation, and once for the
-	// price movement that may occur between querying the oracle and
-	// acquiring the quote. We don't really care about this margin being too
-	// big, this only affects the max units our peer agrees to route.
-	maxMathUnits = maxMathUnits.Add(toleranceUnits).Add(toleranceUnits)
-
-	// Now parse the result back to uint64.
-	maxUnits = maxMathUnits.ToUint64()
-
 	resp, err := r.AddAssetBuyOrder(ctx, &rfqrpc.AddAssetBuyOrderRequest{
 		AssetSpecifier: &rfqrpc.AssetSpecifier{
 			Id: &rfqrpc.AssetSpecifier_AssetId{