midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2026-06-11 05:21:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #499 from tecnovert/fix3

Browse Source 
fix: check if offer matches reverse state for incoming messages
This commit is contained in:
tecnovert
2026-06-10 18:09:19 +00:00
committed by GitHub
parent cbb6047ca7 ac8216152c
commit a2e6e730e3
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basicswap/basicswap.py
+14 -8
View File
@@ -11135,9 +11135,11 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
offer_id = bid_data.offer_msg_id offer_id = bid_data.offer_msg_id
offer, xmr_offer = self.getXmrOffer(offer_id) offer, xmr_offer = self.getXmrOffer(offer_id)
ensure(offer and offer.was_sent, f"Offer not found: {self.log.id(offer_id)}.") ensure(offer and offer.was_sent, f"Offer not found: {self.log.id(offer_id)}")
ensure(offer.swap_type == SwapTypes.XMR_SWAP, "Bid/offer swap type mismatch") ensure(offer.swap_type == SwapTypes.XMR_SWAP, "Bid/offer swap type mismatch")
ensure(xmr_offer, f"Adaptor-sig offer not found: {self.log.id(offer_id)}.") ensure(xmr_offer, f"Adaptor-sig offer not found: {self.log.id(offer_id)}")
reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to)
ensure(reverse_bid is False, f"Offer: {self.log.id(offer_id)} is reversed")
ci_from = self.ci(offer.coin_from) ci_from = self.ci(offer.coin_from)
ci_to = self.ci(offer.coin_to) ci_to = self.ci(offer.coin_to)
@@ -12771,9 +12773,11 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
offer_id = bid_data.offer_msg_id offer_id = bid_data.offer_msg_id
offer, xmr_offer = self.getXmrOffer(offer_id) offer, xmr_offer = self.getXmrOffer(offer_id)
ensure(offer and offer.was_sent, f"Offer not found: {self.log.id(offer_id)}.") ensure(offer and offer.was_sent, f"Offer not found: {self.log.id(offer_id)}")
ensure(offer.swap_type == SwapTypes.XMR_SWAP, "Bid/offer swap type mismatch") ensure(offer.swap_type == SwapTypes.XMR_SWAP, "Bid/offer swap type mismatch")
ensure(xmr_offer, f"Adaptor-sig offer not found: {self.log.id(offer_id)}.") ensure(xmr_offer, f"Adaptor-sig offer not found: {self.log.id(offer_id)}")
reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to)
ensure(reverse_bid is True, f"Offer: {self.log.id(offer_id)} not reversed")
self.validateMessageNets(bid_data.message_nets) self.validateMessageNets(bid_data.message_nets)
@@ -12888,12 +12892,14 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
bid_id = msg_data.bid_msg_id bid_id = msg_data.bid_msg_id
bid, xmr_swap = self.getXmrBid(bid_id) bid, xmr_swap = self.getXmrBid(bid_id)
ensure(bid, f"Bid not found: {self.log.id(bid_id)}.") ensure(bid, f"Bid not found: {self.log.id(bid_id)}")
ensure(xmr_swap, f"Adaptor-sig swap not found: {self.log.id(bid_id)}.") ensure(xmr_swap, f"Adaptor-sig swap not found: {self.log.id(bid_id)}")
offer, xmr_offer = self.getXmrOffer(bid.offer_id) offer, xmr_offer = self.getXmrOffer(bid.offer_id)
ensure(offer, f"Offer not found: {self.log.id(bid.offer_id)}.") ensure(offer, f"Offer not found: {self.log.id(bid.offer_id)}")
ensure(xmr_offer, f"Adaptor-sig offer not found: {self.log.id(bid.offer_id)}.") ensure(xmr_offer, f"Adaptor-sig offer not found: {self.log.id(bid.offer_id)}")
reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to)
ensure(reverse_bid is True, f"Offer: {self.log.id(bid.offer_id)} not reversed")
ensure(msg["to"] == bid.bid_addr, "Received on incorrect address") ensure(msg["to"] == bid.bid_addr, "Received on incorrect address")
ensure(msg["from"] == offer.addr_from, "Sent from incorrect address") ensure(msg["from"] == offer.addr_from, "Sent from incorrect address")