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

fix: get actual blinded Part refund vout

Browse Source
This commit is contained in:
tecnovert
2026-06-06 23:06:26 +02:00
parent 2b2d14b86a
commit f47320e0e4
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basicswap/basicswap.py
+12 -3
View File
@@ -7964,11 +7964,14 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
"",
cursor,
)
refund_vout: int = ci_from.getLockRefundVout(
xmr_swap.a_lock_refund_tx, xmr_swap.vkbv
)
bid.txns[TxTypes.XMR_SWAP_A_LOCK_REFUND] = SwapTx(
bid_id=bid_id,
tx_type=TxTypes.XMR_SWAP_A_LOCK_REFUND,
txid=bytes.fromhex(txid),
vout=0,
vout=refund_vout,
)
self.saveBidInSession(bid_id, bid, cursor, xmr_swap)
self.commitDB()
@@ -7980,11 +7983,14 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
)
txid = ci_from.getTxid(xmr_swap.a_lock_refund_tx)
if TxTypes.XMR_SWAP_A_LOCK_REFUND not in bid.txns:
refund_vout: int = ci_from.getLockRefundVout(
xmr_swap.a_lock_refund_tx, xmr_swap.vkbv
)
bid.txns[TxTypes.XMR_SWAP_A_LOCK_REFUND] = SwapTx(
bid_id=bid_id,
tx_type=TxTypes.XMR_SWAP_A_LOCK_REFUND,
txid=txid,
vout=0,
vout=refund_vout,
)
self.saveBidInSession(bid_id, bid, cursor, xmr_swap)
self.commitDB()
@@ -9058,11 +9064,14 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
)
if TxTypes.XMR_SWAP_A_LOCK_REFUND not in bid.txns:
refund_vout: int = ci_from.getLockRefundVout(
bytes.fromhex(spend_txn_hex), xmr_swap.vkbv
)
bid.txns[TxTypes.XMR_SWAP_A_LOCK_REFUND] = SwapTx(
bid_id=bid.bid_id,
tx_type=TxTypes.XMR_SWAP_A_LOCK_REFUND,
txid=xmr_swap.a_lock_refund_tx_id,
vout=0,
vout=refund_vout,
)
else:
self.setBidError(
basicswap/interface/base.py
+3
View File
@@ -192,6 +192,9 @@ class AdaptorSigInterface:
def getScriptLockRefundSwipeTxDummyWitness(self, script: bytes) -> List[bytes]:
return [bytes(72), b"", bytes(len(script))]
def getLockRefundVout(self, lock_refund_tx_data: bytes, vbkv: bytes):
return 0
class Secp256k1Interface(CoinInterface, AdaptorSigInterface):
def __init__(self, **kwargs):
basicswap/interface/part.py
+11
View File
@@ -1299,6 +1299,17 @@ class PARTInterfaceBlind(PARTInterface):
"fundrawtransactionfrom", ["blind", tx_hex, {}, outputs_info, options]
)["hex"]
def getLockRefundVout(self, lock_refund_tx_data: bytes, vkbv: bytes):
lock_refund_tx_obj = self.rpc(
"decoderawtransaction", [lock_refund_tx_data.hex()]
)
# Nonce is derived from vkbv
nonce = self.getScriptLockRefundTxNonce(vkbv)
# Find the output of the lock refund tx to spend
spend_n, input_blinded_info = self.findOutputByNonce(lock_refund_tx_obj, nonce)
return spend_n
class PARTInterfaceAnon(PARTInterface):