diff --git a/basicswap/basicswap_util.py b/basicswap/basicswap_util.py index 5c0f17f..5ee6cbd 100644 --- a/basicswap/basicswap_util.py +++ b/basicswap/basicswap_util.py @@ -641,6 +641,7 @@ def canTimeoutBidState(state): BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_TX_SIGS, BidStates.XMR_SWAP_HAVE_SCRIPT_COIN_SPEND_TX, BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX, + BidStates.BID_REQUEST_ACCEPTED, ) diff --git a/basicswap/db.py b/basicswap/db.py index a42cb2b..9b49fae 100644 --- a/basicswap/db.py +++ b/basicswap/db.py @@ -14,7 +14,7 @@ from typing import Optional CURRENT_DB_VERSION = 34 -CURRENT_DB_DATA_VERSION = 7 +CURRENT_DB_DATA_VERSION = 8 class Concepts(IntEnum): diff --git a/basicswap/db_upgrades.py b/basicswap/db_upgrades.py index 9bbddba..cae8782 100644 --- a/basicswap/db_upgrades.py +++ b/basicswap/db_upgrades.py @@ -138,6 +138,14 @@ def upgradeDatabaseData(self, data_version): "state_id": int(state), }, ) + if data_version > 0 and data_version < 8: + cursor.execute( + "UPDATE bidstates SET can_timeout = :can_timeout WHERE state_id = :state_id", + { + "can_timeout": 1, + "state_id": int(BidStates.BID_REQUEST_ACCEPTED), + }, + ) if data_version > 0 and data_version < 4: for state in ( BidStates.BID_REQUEST_SENT,