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

Keep compatible with Particl 32.2.7

Browse Source 
Only call smsggetdifficulty when smsg_plaintext_version >= 2
This commit is contained in:
tecnovert
2025-07-25 10:34:39 +02:00
parent 355da5ee90
commit 6e614ff76d
4 changed files with 93 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
basicswap/basicswap.py
View File

@@ -3751,7 +3751,10 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
str.format("{:02x}", MessageTypes.ADS_BID_LF) + msg_buf.to_bytes().hex()
)
self.logD(LC.NET, f"sendADSBidIntentMessage offer.message_nets {offer.message_nets}, bid.message_nets {bid.message_nets}, msg_buf.message_nets {msg_buf.message_nets}")
self.logD(
LC.NET,
f"sendADSBidIntentMessage offer.message_nets {offer.message_nets}, bid.message_nets {bid.message_nets}, msg_buf.message_nets {msg_buf.message_nets}",
)
return self.sendMessage(
bid.bid_addr,
offer.addr_from,
@@ -3800,7 +3803,10 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
)
msg_valid: int = max(self.SMSG_SECONDS_IN_HOUR, valid_for_seconds)
self.logD(LC.NET, f"sendXmrBidMessage offer.message_nets {offer.message_nets}, bid.message_nets {bid.message_nets}, msg_buf.message_nets {msg_buf.message_nets}")
self.logD(
LC.NET,
f"sendXmrBidMessage offer.message_nets {offer.message_nets}, bid.message_nets {bid.message_nets}, msg_buf.message_nets {msg_buf.message_nets}",
)
bid_msg_id = self.sendMessage(
bid.bid_addr,
offer.addr_from,
@@ -3877,7 +3883,10 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
payload_hex = str.format("{:02x}", MessageTypes.BID) + msg_buf.to_bytes().hex()
msg_valid: int = max(self.SMSG_SECONDS_IN_HOUR, valid_for_seconds)
self.logD(LC.NET, f"sendBidMessage offer.message_nets {offer.message_nets}, bid.message_nets {bid.message_nets}, msg_buf.message_nets {msg_buf.message_nets}")
self.logD(
LC.NET,
f"sendBidMessage offer.message_nets {offer.message_nets}, bid.message_nets {bid.message_nets}, msg_buf.message_nets {msg_buf.message_nets}",
)
bid_msg_id = self.sendMessage(
bid.bid_addr,
offer.addr_from,
@@ -7992,8 +8001,16 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
network_type: str = msg.get("msg_net", "smsg")
network_type_received_on_id: int = networkTypeToID(network_type)
bid_message_nets: str = self.selectMessageNetString([network_type_received_on_id, ], bid_data.message_nets)
self.logD(LC.NET, f"processBid offer.message_nets {offer.message_nets}, bid.message_nets {bid_message_nets}, bid_data.message_nets {bid_data.message_nets}")
bid_message_nets: str = self.selectMessageNetString(
[
network_type_received_on_id,
],
bid_data.message_nets,
)
self.logD(
LC.NET,
f"processBid offer.message_nets {offer.message_nets}, bid.message_nets {bid_message_nets}, bid_data.message_nets {bid_data.message_nets}",
)
# TODO: Allow higher bids
# assert (bid_data.rate != offer['data'].rate), 'Bid rate mismatch'
@@ -8457,8 +8474,16 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
network_type: str = msg.get("msg_net", "smsg")
network_type_received_on_id: int = networkTypeToID(network_type)
bid_message_nets: str = self.selectMessageNetString([network_type_received_on_id, ], bid_data.message_nets)
self.logD(LC.NET, f"processXmrBid offer.message_nets {offer.message_nets}, bid.message_nets {bid_message_nets}, bid_data.message_nets {bid_data.message_nets}")
bid_message_nets: str = self.selectMessageNetString(
[
network_type_received_on_id,
],
bid_data.message_nets,
)
self.logD(
LC.NET,
f"processXmrBid offer.message_nets {offer.message_nets}, bid.message_nets {bid_message_nets}, bid_data.message_nets {bid_data.message_nets}",
)
bid, xmr_swap = self.getXmrBid(bid_id)
if bid is None: