diff --git a/basicswap/interface/btc.py b/basicswap/interface/btc.py index 676231d..11bf565 100644 --- a/basicswap/interface/btc.py +++ b/basicswap/interface/btc.py @@ -1090,7 +1090,7 @@ class BTCInterface(CoinInterface): def encodeSharedAddress(self, Kbv, Kbs): return self.pubkey_to_segwit_address(Kbs) - def publishBLockTx(self, kbv, Kbs, output_amount, feerate, delay_for: int = 10, unlock_time: int = 0) -> bytes: + def publishBLockTx(self, kbv, Kbs, output_amount, feerate, unlock_time: int = 0) -> bytes: b_lock_tx = self.createBLockTx(Kbs, output_amount) b_lock_tx = self.fundTx(b_lock_tx, feerate) diff --git a/basicswap/interface/part.py b/basicswap/interface/part.py index 34758bd..9044667 100644 --- a/basicswap/interface/part.py +++ b/basicswap/interface/part.py @@ -664,7 +664,7 @@ class PARTInterfaceBlind(PARTInterface): def getSpendableBalance(self) -> int: return self.make_int(self.rpc_wallet('getbalances')['mine']['blind_trusted']) - def publishBLockTx(self, vkbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes: + def publishBLockTx(self, vkbv: bytes, Kbs: bytes, output_amount: int, feerate: int, unlock_time: int = 0) -> bytes: Kbv = self.getPubkey(vkbv) sx_addr = self.formatStealthAddress(Kbv, Kbs) self._log.debug('sx_addr: {}'.format(sx_addr)) @@ -802,7 +802,7 @@ class PARTInterfaceAnon(PARTInterface): def coin_name(self) -> str: return super().coin_name() + ' Anon' - def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes: + def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, unlock_time: int = 0) -> bytes: Kbv = self.getPubkey(kbv) sx_addr = self.formatStealthAddress(Kbv, Kbs) diff --git a/basicswap/interface/xmr.py b/basicswap/interface/xmr.py index d9c926f..9b43a9e 100644 --- a/basicswap/interface/xmr.py +++ b/basicswap/interface/xmr.py @@ -319,7 +319,7 @@ class XMRInterface(CoinInterface): def encodeSharedAddress(self, Kbv: bytes, Kbs: bytes) -> str: return xmr_util.encode_address(Kbv, Kbs) - def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes: + def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, unlock_time: int = 0) -> bytes: with self._mx_wallet: self.openWallet(self._wallet_filename) self.rpc_wallet('refresh') @@ -334,18 +334,6 @@ class XMRInterface(CoinInterface): self._log.info('publishBLockTx %s to address_b58 %s', rv['tx_hash'], shared_addr) tx_hash = bytes.fromhex(rv['tx_hash']) - if self._sc.debug: - i = 0 - while not self._sc.delay_event.is_set(): - gt_params = {'out': True, 'pending': True, 'failed': True, 'pool': True, } - rv = self.rpc_wallet('get_transfers', gt_params) - self._log.debug('get_transfers {}'.format(dumpj(rv))) - if 'pending' not in rv: - break - if i >= delay_for: - break - self._sc.delay_event.wait(1.0) - return tx_hash def findTxB(self, kbv, Kbs, cb_swap_value, cb_block_confirmed, restore_height, bid_sender):