Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-05 22:10:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add slashed return as rewards when bonded stake is uneven (#538)

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-05-05 12:07:13 +00:00 committed by GitHub
parent e6ddcf9e4b
commit a10f7f2e21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
api/logics.py
View File

@ -134,9 +134,9 @@ class Logics:
+ "{:,}".format(MIN_TRADE) + "{:,}".format(MIN_TRADE)
+ " Sats" + " Sats"
} }
elif min_sats < max_sats / 8: elif min_sats < max_sats / 15:
return False, { return False, {
"bad_request": "Your order amount range is too large. Max amount can only be 8 times bigger than min amount" "bad_request": "Your order amount range is too large. Max amount can only be 15 times bigger than min amount"
} }
return True, None return True, None
@ -302,7 +302,7 @@ class Logics:
order.expiry_reason = Order.ExpiryReasons.NESCRO order.expiry_reason = Order.ExpiryReasons.NESCRO
order.save() order.save()
# Reward taker with part of the maker bond # Reward taker with part of the maker bond
cls.add_slashed_rewards(order.maker_bond, order.taker.robot) cls.add_slashed_rewards(order.maker_bond, order.taker_bond)
return True return True
# If maker is buyer, settle the taker's bond order goes back to public # If maker is buyer, settle the taker's bond order goes back to public
@ -321,7 +321,7 @@ class Logics:
cls.publish_order(order) cls.publish_order(order)
send_notification.delay(order_id=order.id, message="order_published") send_notification.delay(order_id=order.id, message="order_published")
# Reward maker with part of the taker bond # Reward maker with part of the taker bond
cls.add_slashed_rewards(taker_bond, order.maker.robot) cls.add_slashed_rewards(taker_bond, order.maker_bond)
return True return True
elif order.status == Order.Status.WFI: elif order.status == Order.Status.WFI:
@ -338,7 +338,7 @@ class Logics:
order.expiry_reason = Order.ExpiryReasons.NINVOI order.expiry_reason = Order.ExpiryReasons.NINVOI
order.save() order.save()
# Reward taker with part of the maker bond # Reward taker with part of the maker bond
cls.add_slashed_rewards(order.maker_bond, order.taker.robot) cls.add_slashed_rewards(order.maker_bond, order.taker_bond)
return True return True
# If maker is seller settle the taker's bond, order goes back to public # If maker is seller settle the taker's bond, order goes back to public
@ -352,7 +352,7 @@ class Logics:
cls.publish_order(order) cls.publish_order(order)
send_notification.delay(order_id=order.id, message="order_published") send_notification.delay(order_id=order.id, message="order_published")
# Reward maker with part of the taker bond # Reward maker with part of the taker bond
cls.add_slashed_rewards(taker_bond, order.maker.robot) cls.add_slashed_rewards(taker_bond, order.maker_bond)
return True return True
elif order.status in [Order.Status.CHA, Order.Status.FSE]: elif order.status in [Order.Status.CHA, Order.Status.FSE]:
@ -417,14 +417,14 @@ class Logics:
cls.return_escrow(order) cls.return_escrow(order)
cls.settle_bond(order.maker_bond) cls.settle_bond(order.maker_bond)
cls.return_bond(order.taker_bond) cls.return_bond(order.taker_bond)
cls.add_slashed_rewards(order.maker_bond, order.taker.robot) cls.add_slashed_rewards(order.maker_bond, order.taker_bond)
order.status = Order.Status.MLD order.status = Order.Status.MLD
elif num_messages_maker == 0: elif num_messages_maker == 0:
cls.return_escrow(order) cls.return_escrow(order)
cls.settle_bond(order.maker_bond) cls.settle_bond(order.maker_bond)
cls.return_bond(order.taker_bond) cls.return_bond(order.taker_bond)
cls.add_slashed_rewards(order.taker_bond, order.maker.robot) cls.add_slashed_rewards(order.taker_bond, order.maker_bond)
order.status = Order.Status.TLD order.status = Order.Status.TLD
else: else:
return False return False
@ -982,7 +982,7 @@ class Logics:
order.status = Order.Status.UCA order.status = Order.Status.UCA
order.save() order.save()
# Reward taker with part of the maker bond # Reward taker with part of the maker bond
cls.add_slashed_rewards(order.maker_bond, order.taker.robot) cls.add_slashed_rewards(order.maker_bond, order.taker_bond)
return True, None return True, None
# 4.b) When taker cancel after bond (before escrow) # 4.b) When taker cancel after bond (before escrow)
@ -1001,7 +1001,7 @@ class Logics:
cls.publish_order(order) cls.publish_order(order)
send_notification.delay(order_id=order.id, message="order_published") send_notification.delay(order_id=order.id, message="order_published")
# Reward maker with part of the taker bond # Reward maker with part of the taker bond
cls.add_slashed_rewards(order.taker_bond, order.maker.robot) cls.add_slashed_rewards(order.taker_bond, order.maker_bond)
return True, None return True, None
# 5) When trade collateral has been posted (after escrow) # 5) When trade collateral has been posted (after escrow)
@ -1634,14 +1634,36 @@ class Logics:
return return
@classmethod @classmethod
def add_slashed_rewards(cls, bond, robot): def add_slashed_rewards(cls, slashed_bond, staked_bond):
""" """
When a bond is slashed due to overtime, rewards the user that was waiting. When a bond is slashed due to overtime, rewards the user that was waiting.
slashed_bond is the bond settled by the robot who forfeits his bond.
staked_bond is the bond that was at stake by the robot who is rewarded.
It may happen that the Sats at stake by the maker are larger than the Sats
at stake by the taker (range amount orders where the taker does not take the
maximum available). In those cases, the change is added back also to the robot
that was slashed (discounted by the forfeited amount).
""" """
reward_fraction = float(config("SLASHED_BOND_REWARD_SPLIT")) reward_fraction = config("SLASHED_BOND_REWARD_SPLIT", cast=float, default=0.5)
reward = int(bond.num_satoshis * reward_fraction)
robot.earned_rewards += reward if staked_bond.num_satoshis < slashed_bond.num_satoshis:
robot.save() slashed_satoshis = min(slashed_bond.num_satoshis, staked_bond.num_satoshis)
slashed_return = int(slashed_bond.num_satoshis - slashed_satoshis)
else:
slashed_satoshis = slashed_bond.num_satoshis
slashed_return = 0
reward = int(slashed_satoshis * reward_fraction)
rewarded_robot = staked_bond.sender.robot
rewarded_robot.earned_rewards += reward
rewarded_robot.save()
if slashed_return > 100:
slashed_robot = slashed_bond.sender.robot
slashed_robot.earned_rewards += slashed_return
slashed_robot.save()
return return

2
frontend/src/components/MakerForm/MakerForm.tsx
View File

@ -75,7 +75,7 @@ const MakerForm = ({
const [openDialogs, setOpenDialogs] = useState<boolean>(false); const [openDialogs, setOpenDialogs] = useState<boolean>(false);
const [submittingRequest, setSubmittingRequest] = useState<boolean>(false); const [submittingRequest, setSubmittingRequest] = useState<boolean>(false);
const maxRangeAmountMultiple = 7.8; const maxRangeAmountMultiple = 14.8;
const minRangeAmountMultiple = 1.6; const minRangeAmountMultiple = 1.6;
const amountSafeThresholds = [1.03, 0.98]; const amountSafeThresholds = [1.03, 0.98];