Deprecate old routing budget pipeline (#347)

Delete old routing budget routines. Clients older than 0.3.1 are now incompatible!
This commit is contained in:
Reckless_Satoshi 2023-02-10 13:34:35 +00:00 committed by GitHub
parent 965bbb0765
commit b02fdcb084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 54 deletions

View File

@ -283,14 +283,12 @@ class LNNode:
route_hints = payreq_decoded.route_hints
# Max amount RoboSats will pay for routing
# Start deprecate after v0.3.1 (only else max_routing_fee_sats will remain)
if routing_budget_ppm == 0:
max_routing_fee_sats = max(
num_satoshis * float(config("PROPORTIONAL_ROUTING_FEE_LIMIT")),
float(config("MIN_FLAT_ROUTING_FEE_LIMIT_REWARD")),
)
else:
# End deprecate
max_routing_fee_sats = int(
float(num_satoshis) * float(routing_budget_ppm) / 1000000
)

View File

@ -1738,19 +1738,10 @@ class Logics:
)
if not order.is_swap:
platform_summary["routing_budget_sats"] = order.payout.routing_budget_sats
# Start Deprecated after v0.3.1
platform_summary["routing_fee_sats"] = order.payout.fee
# End Deprecated after v0.3.1
platform_summary["trade_revenue_sats"] = int(
order.trade_escrow.num_satoshis
- order.payout.num_satoshis
# Start Deprecated after v0.3.1 (will be `- order.payout.routing_budget_sats`)
- (
order.payout.fee
if order.payout.routing_budget_sats == 0
else order.payout.routing_budget_sats
)
# End Deprecated after v0.3.1
- order.payout.routing_budget_sats
)
else:
platform_summary["routing_fee_sats"] = 0

View File

@ -86,23 +86,11 @@ def follow_send_payment(hash):
from api.models import LNPayment, Order
lnpayment = LNPayment.objects.get(payment_hash=hash)
# Start deprecate after v0.3.1 (only else max_routing_fee_sats will remain)
if lnpayment.routing_budget_ppm == 0:
fee_limit_sat = int(
max(
lnpayment.num_satoshis
* float(config("PROPORTIONAL_ROUTING_FEE_LIMIT")),
float(config("MIN_FLAT_ROUTING_FEE_LIMIT")),
)
) # 1000 ppm or 10 sats
else:
# End deprecate
# Defaults is 0ppm. Set by the user over API. Defaults to 1000 ppm on ReactJS frontend.
fee_limit_sat = int(
float(lnpayment.num_satoshis)
* float(lnpayment.routing_budget_ppm)
/ 1000000
)
# Default is 0ppm. Set by the user over API. Client's default is 1000 ppm.
fee_limit_sat = int(
float(lnpayment.num_satoshis) * float(lnpayment.routing_budget_ppm) / 1000000
)
timeout_seconds = int(config("PAYOUT_TIMEOUT_SECONDS"))
request = LNNode.routerrpc.SendPaymentRequest(

View File

@ -285,9 +285,6 @@ class OrderView(viewsets.ViewSet):
currency=order.currency, status=Order.Status.PUB
)
)
# Adds/generate telegram token and whether it is enabled
# Deprecated
data = {**data, **Telegram.get_context(request.user)}
# For participants add positions, nicks and status as a message and hold invoices status
data["is_buyer"] = Logics.is_buyer(order, request.user)
@ -441,11 +438,6 @@ class OrderView(viewsets.ViewSet):
if order.payout.status == LNPayment.Status.EXPIRE:
data["invoice_expired"] = True
# Add invoice amount once again if invoice was expired.
# Start deprecate after v0.3.1
data["invoice_amount"] = Logics.payout_amount(order, request.user)[1][
"invoice_amount"
]
# End deprecate
data["trade_satoshis"] = Logics.payout_amount(order, request.user)[1][
"invoice_amount"
]
@ -643,23 +635,6 @@ class UserView(APIView):
context = {"bad_request": "Invalid serializer"}
return Response(context, status=status.HTTP_400_BAD_REQUEST)
# Deprecated
#
# If an existing user opens the main page by mistake, we do not want it to create a new nickname/profile for him
# if request.user.is_authenticated:
# context = {"nickname": request.user.username}
# not_participant, _, order = Logics.validate_already_maker_or_taker(
# request.user
# )
# # Does not allow this 'mistake' if an active order
# if not not_participant:
# context["active_order_id"] = order.id
# context[
# "bad_request"
# ] = f"You are already logged in as {request.user} and have an active order"
# return Response(context, status.HTTP_400_BAD_REQUEST)
# The new way. The token is never sent. Only its SHA256
token_sha256 = serializer.data.get("token_sha256")
public_key = serializer.data.get("public_key")