Revert "decred: v2.1.2"

basicswap/__init__.py

@@ -1,3 +1,3 @@
 name = "basicswap"
 
-__version__ = "0.15.2"
+__version__ = "0.15.1"

basicswap/basicswap.py

@@ -3848,7 +3848,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
 
                 txid = ci_from.publishTx(bytes.fromhex(txn))
                 self.log.debug(
-                    f"Submitted initiate txn {self.logIDT(txid)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}",
+                    f"Submitted initiate txn {txid} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}",
                 )
                 bid.initiate_tx = SwapTx(
                     bid_id=bid_id,
@@ -5514,7 +5514,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                 txn = self.createParticipateTxn(bid_id, bid, offer, participate_script)
                 txid = ci_to.publishTx(bytes.fromhex(txn))
                 self.log.debug(
-                    f"Submitted participate tx {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}"
+                    f"Submitted participate tx {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}"
                 )
                 bid.setPTxState(TxStates.TX_SENT)
                 self.logEvent(
@@ -5622,7 +5622,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
             txn = self.createRedeemTxn(ci_to.coin_type(), bid)
             txid = ci_to.publishTx(bytes.fromhex(txn))
             self.log.debug(
-                f"Submitted participate redeem tx {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
+                f"Submitted participate redeem tx {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
             )
             self.logEvent(
                 Concepts.BID, bid.bid_id, EventLogTypes.PTX_REDEEM_PUBLISHED, "", None
@@ -5908,7 +5908,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                             )
 
                             self.log.info(
-                                f"Submitted coin a lock refund spend tx for bid {self.log.id(bid_id)}, txid {self.logIDT(txid_str)}"
+                                f"Submitted coin a lock refund spend tx for bid {self.log.id(bid_id)}, txid {self.log.id(txid_str)}"
                             )
                             bid.txns[TxTypes.XMR_SWAP_A_LOCK_REFUND_SPEND] = SwapTx(
                                 bid_id=bid_id,
@@ -5983,7 +5983,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                                         txid=bytes.fromhex(txid_hex),
                                     )
                                     self.log.info(
-                                        f"Submitted mercy tx for bid {self.log.id(bid_id)}, txid {self.logIDT(txid_hex)}"
+                                        f"Submitted mercy tx for bid {self.log.id(bid_id)}, txid {self.log.id(txid_hex)}"
                                     )
                                     self.logBidEvent(
                                         bid_id,
@@ -6670,7 +6670,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
             try:
                 txid = ci_to.publishTx(bid.participate_txn_refund)
                 self.log.debug(
-                    f"Submitted participate refund txn {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
+                    f"Submitted participate refund txn {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
                 )
                 self.logEvent(
                     Concepts.BID,
@@ -6726,7 +6726,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
     def removeWatchedTransaction(self, coin_type, bid_id: bytes, txid_hex: str) -> None:
         # Remove all for bid if txid is None
         self.log.debug(
-            f"Removing watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(txid_hex)}"
+            f"Removing watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(txid_hex)}"
         )
         watched = self.coin_clients[coin_type]["watched_transactions"]
         old_len = len(watched)
@@ -6735,7 +6735,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
             if wo.bid_id == bid_id and (txid_hex is None or wo.txid_hex == txid_hex):
                 del watched[i]
                 self.log.debug(
-                    f"Removed watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(wo.txid_hex)}"
+                    f"Removed watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(wo.txid_hex)}"
                 )
 
     def addWatchedOutput(
@@ -6756,7 +6756,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
     def removeWatchedOutput(self, coin_type, bid_id: bytes, txid_hex: str) -> None:
         # Remove all for bid if txid is None
         self.log.debug(
-            f"Removing watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(txid_hex)}"
+            f"Removing watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(txid_hex)}"
         )
         watched = self.coin_clients[coin_type]["watched_outputs"]
         old_len = len(watched)
@@ -6765,7 +6765,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
             if wo.bid_id == bid_id and (txid_hex is None or wo.txid_hex == txid_hex):
                 del watched[i]
                 self.log.debug(
-                    f"Removed watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(wo.txid_hex)}"
+                    f"Removed watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(wo.txid_hex)}"
                 )
 
     def addWatchedScript(
@@ -9408,7 +9408,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                 xmr_swap.a_lock_tx, xmr_swap.a_lock_tx_script
             )
             self.log.debug(
-                f"Submitted lock tx {self.logIDT(txid_hex)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}.",
+                f"Submitted lock tx {self.log.id(txid_hex)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}.",
             )
 
             if bid.xmr_a_lock_tx is None:
@@ -9560,7 +9560,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
             return
 
         self.log.debug(
-            f"Submitted lock txn {self.logIDT(b_lock_tx_id)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
+            f"Submitted lock txn {self.log.id(bid_id)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
         )
         bid.xmr_b_lock_tx = SwapTx(
             bid_id=bid_id,
@@ -9733,7 +9733,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
 
         txid = bytes.fromhex(ci_from.publishTx(xmr_swap.a_lock_spend_tx))
         self.log.debug(
-            f"Submitted lock spend txn {self.logIDT(txid)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}."
+            f"Submitted lock spend txn {self.log.id(txid)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}."
         )
         self.logBidEvent(
             bid.bid_id, EventLogTypes.LOCK_TX_A_SPEND_TX_PUBLISHED, "", cursor
@@ -9843,7 +9843,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                 lock_tx_vout=lock_tx_vout,
             )
             self.log.debug(
-                f"Submitted lock B spend txn {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
+                f"Submitted lock B spend txn {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
             )
             self.logBidEvent(
                 bid.bid_id, EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED, "", cursor
@@ -9958,7 +9958,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
                 ),
             )
             self.log.debug(
-                f"Submitted lock B refund txn {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
+                f"Submitted lock B refund txn {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
             )
             self.logBidEvent(
                 bid.bid_id, EventLogTypes.LOCK_TX_B_REFUND_TX_PUBLISHED, "", cursor

basicswap/bin/prepare.py

@@ -61,7 +61,7 @@ BITCOIN_VERSION_TAG = os.getenv("BITCOIN_VERSION_TAG", "")
 LITECOIN_VERSION = os.getenv("LITECOIN_VERSION", "0.21.4")
 LITECOIN_VERSION_TAG = os.getenv("LITECOIN_VERSION_TAG", "")
 
-DCR_VERSION = os.getenv("DCR_VERSION", "2.1.2")
+DCR_VERSION = os.getenv("DCR_VERSION", "1.8.1")
 DCR_VERSION_TAG = os.getenv("DCR_VERSION_TAG", "")
 
 NMC_VERSION = os.getenv("NMC_VERSION", "28.0")

basicswap/chainparams.py

@@ -242,7 +242,7 @@ chainparams = {
             "pubkey_address": 0x0E91,
             "script_address": 0x0E6C,
             "key_prefix": 0x2307,
-            "bip44": 115,
+            "bip44": 1,
             "min_amount": 100000,
             "max_amount": 10000000 * COIN,
         },

basicswap/interface/dcr/dcr.py

@@ -406,9 +406,6 @@ class DCRInterface(Secp256k1Interface):
         # Adjust verificationprogress to consider blocks wallet has synced
         wallet_blocks = self.rpc_wallet("getinfo")["blocks"]
         synced_ind = bci["verificationprogress"]
-        if bci["headers"] < 1:
-            wallet_synced_ind = 0
-        else:
         wallet_synced_ind = wallet_blocks / bci["headers"]
         if wallet_synced_ind < synced_ind:
             bci["verificationprogress"] = wallet_synced_ind

basicswap/interface/dcr/util.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2024 tecnovert
-# Copyright (c) 2025 The Basicswap developers
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -36,13 +35,6 @@ def createDCRWallet(args, hex_seed, logging, delay_event):
             response = b"y\n"
         elif "Enter existing wallet seed" in buf:
             response = (hex_seed + "\n").encode("utf-8")
-        elif "Do you have a wallet birthday we should rescan from" in buf:
-            response = b"no\n"
-        elif (
-            "Do you have an additional account to import from an extended public key"
-            in buf
-        ):
-            response = b"no\n"
         elif "Seed input successful" in buf:
             pass
         elif "Upgrading database from version" in buf:

basicswap/protocols/atomic_swap_1.py

@@ -130,7 +130,10 @@ def redeemITx(self, bid_id: bytes, cursor):
 
     bid.initiate_tx.spend_txid = bytes.fromhex(txid)
     self.log.debug(
-        f"Submitted initiate redeem txn {self.logIDT(txid)} to {ci_from.coin_name()} chain for bid {self.logIDB(bid_id)}"
+        "Submitted initiate redeem txn %s to %s chain for bid %s",
+        txid,
+        ci_from.coin_name(),
+        bid_id.hex(),
     )
     self.logEvent(Concepts.BID, bid_id, EventLogTypes.ITX_REDEEM_PUBLISHED, "", cursor)
 

basicswap/protocols/xmr_swap_1.py

@@ -119,7 +119,7 @@ def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key, cursor=None):
             lock_tx_vout=lock_tx_vout,
         )
         self.log.debug(
-            f"Submitted lock B spend txn {self.logIDT(txid)} to {ci_follower.coin_name()} chain for bid {self.log.id(bid_id)}."
+            f"Submitted lock B spend txn {self.log.id(txid)} to {ci_follower.coin_name()} chain for bid {self.log.id(bid_id)}."
         )
         self.logBidEvent(
             bid.bid_id,

guix.scm

@@ -90,7 +90,7 @@
 (define python-coincurve-basicswap
   (package
     (name "python-coincurve-basicswap")
-    (version "basicswap_v0.3")
+    (version "basicswap_v0.2")
     (source
      (origin
        (method git-fetch)
@@ -101,7 +101,7 @@
        (file-name
         (git-file-name name version))
        (sha256
-        (base32 "08bc8175v4d479lgavkcclc0kkh3icxm9i0i26wqd1g3bv0is8cm"))))
+        (base32 "1vm9cvwr0z02zc0mp7l8qj9vhg8kmfrzysiwzg91zkgmccza9ryc"))))
     (build-system pyproject-build-system)
     (arguments
      `(#:phases
@@ -135,15 +135,15 @@
 (define-public basicswap
 (package
   (name "basicswap")
-  (version "0.15.2")
+  (version "0.15.1")
   (source (origin
     (method git-fetch)
     (uri (git-reference
       (url "https://github.com/basicswap/basicswap")
-      (commit "2259e964b11925587301070f9fc15e2226b2eb69")))
+      (commit "0bc9d3a5db40f54d79e2ab18be58b6bbc20740d1")))
     (sha256
       (base32
-        "0d544bj4kvra9y6rpqai1yvnk2igxj4z8s14g5jpksx5z9l0nyy3"))
+        "1x6c6hynvbayq4cyv9s6vwgsgdmhm7r1av6iy7pax103lj20habf"))
     (file-name (git-file-name name version))))
   (build-system pyproject-build-system)
 

tests/basicswap/extended/test_dcr.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2024 tecnovert
-# Copyright (c) 2024-2025 The Basicswap developers
+# Copyright (c) 2024 The Basicswap developers
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -689,7 +689,7 @@ def prepareDCDDataDir(datadir, node_id, conf_file, dir_prefix, num_nodes=3):
         "noseeders=1\n",
         "nodnsseed=1\n",
         "nodiscoverip=1\n",
-        "miningaddr=SsppG7KLiH52NC7iJmUVGVq89FLS83E5vho\n",
+        "miningaddr=SsYbXyjkKAEXXcGdFgr4u4bo4L8RkCxwQpH\n",
     ]
 
     for i in range(0, num_nodes):
@@ -725,8 +725,7 @@ class Test(BaseTest):
     dcr_daemons = []
     start_ltc_nodes = False
     start_xmr_nodes = True
-    # Addresses differ after 2.1.2, simnet bip44id changed from 1 to 115
-    dcr_mining_addr = "SsppG7KLiH52NC7iJmUVGVq89FLS83E5vho"
+    dcr_mining_addr = "SsYbXyjkKAEXXcGdFgr4u4bo4L8RkCxwQpH"
     extra_wait_time = 0
     max_fee: int = 10000
 
@@ -740,8 +739,7 @@ class Test(BaseTest):
     def prepareExtraCoins(cls):
         ci0 = cls.swap_clients[0].ci(cls.test_coin)
         if not cls.restore_instance:
-            dcr_mining_addr = ci0.rpc_wallet("getnewaddress")
-            assert dcr_mining_addr in cls.dcr_mining_addrs
+            assert ci0.rpc_wallet("getnewaddress") == cls.dcr_mining_addr
             cls.dcr_ticket_account = ci0.rpc_wallet(
                 "getaccount",
                 [
@@ -778,7 +776,7 @@ class Test(BaseTest):
         num_passed: int = 0
         for i in range(30):
             try:
-                ci0.rpc_wallet("purchaseticket", [cls.dcr_ticket_account, 0, 1])
+                ci0.rpc_wallet("purchaseticket", [cls.dcr_ticket_account, 0.1, 0])
                 num_passed += 1
                 if num_passed >= 5:
                     break
@@ -904,14 +902,14 @@ class Test(BaseTest):
             masterpubkey = loop_ci.rpc_wallet("getmasterpubkey")
             masterpubkey_data = loop_ci.decode_address(masterpubkey)[4:]
 
-            seed_hash: bytes = loop_ci.getSeedHash(root_key)
+            seed_hash = loop_ci.getSeedHash(root_key)
             if i == 0:
                 assert (
                     masterpubkey
-                    == "spubVUjNdu1HtDuQYHjVLTgdK3JKtC7JQoCUkhkoVn3rJt6kYctRksn4vTGsdV3obeZLHaB1YobsLENYKHjtey67LFZJdjJyAvHuRqgFRpaSmfn"
+                    == "spubVV1z2AFYjVZvzM45FSaWMPRqyUoUwyW78wfANdjdNG6JGCXrr8AbRvUgYb3Lm1iun9CgHew1KswdePryNLKEnBSQ82AjNpYdQgzXPUme9c6"
                 )
             if i < 2:
-                assert hash160(masterpubkey_data) == seed_hash
+                assert seed_hash == hash160(masterpubkey_data)
 
     def test_001_segwit(self):
         logging.info("---------- Test {} segwit".format(self.test_coin.name))