Decred: Add to test_xmr_persistent

basicswap/interface/base.py

@@ -153,16 +153,19 @@ class CoinInterface:
     def use_tx_vsize(self) -> bool:
         return self._use_segwit
 
-    def getLockTxSwapOutputValue(self, bid, xmr_swap):
+    def getLockTxSwapOutputValue(self, bid, xmr_swap) -> int:
         return bid.amount
 
-    def getLockRefundTxSwapOutputValue(self, bid, xmr_swap):
+    def getLockRefundTxSwapOutputValue(self, bid, xmr_swap) -> int:
         return xmr_swap.a_swap_refund_value
 
-    def getLockRefundTxSwapOutput(self, xmr_swap):
+    def getLockRefundTxSwapOutput(self, xmr_swap) -> int:
         # Only one prevout exists
         return 0
 
+    def checkWallets(self) -> int:
+        return 1
+
 
 class AdaptorSigInterface():
     def getScriptLockTxDummyWitness(self, script: bytes):

basicswap/interface/dcr/dcr.py

@@ -109,7 +109,7 @@ def DCRSignatureHash(sign_script: bytes, hash_type: SigHashType, tx: CTransactio
     for txi_n, txi in enumerate(sign_vins):
         hash_buffer += txi.prevout.hash.to_bytes(32, 'little')
         hash_buffer += txi.prevout.n.to_bytes(4, 'little')
-        hash_buffer += txi.prevout.tree.to_bytes(1)
+        hash_buffer += txi.prevout.tree.to_bytes(1, 'little')
 
         # In the case of SigHashNone and SigHashSingle, commit to 0 for everything that is not the input being signed instead.
         if (masked_hash_type == SigHashType.SigHashNone
@@ -308,14 +308,19 @@ class DCRInterface(Secp256k1Interface):
     def getChainHeight(self) -> int:
         return self.rpc('getblockcount')
 
-    def checkWallets(self) -> int:
-        # Only one wallet possible?
-        return 1
-
     def initialiseWallet(self, key: bytes) -> None:
         # Load with --create
         pass
 
+    def getWalletSeedID(self):
+        masterpubkey = self.rpc_wallet('getmasterpubkey')
+        masterpubkey_data = self.decode_address(masterpubkey)[4:]
+        return hash160(masterpubkey_data).hex()
+
+    def checkExpectedSeed(self, expect_seedid) -> bool:
+        self._expect_seedid_hex = expect_seedid
+        return expect_seedid == self.getWalletSeedID()
+
     def getDaemonVersion(self):
         return self.rpc('getnetworkinfo')['version']
 
@@ -368,7 +373,7 @@ class DCRInterface(Secp256k1Interface):
     def encodeKey(self, key_bytes: bytes) -> str:
         wif_prefix = self.chainparams_network()['key_prefix']
         key_type = 0  # STEcdsaSecp256k1
-        b = wif_prefix.to_bytes(2, 'big') + key_type.to_bytes(1) + key_bytes
+        b = wif_prefix.to_bytes(2, 'big') + key_type.to_bytes(1, 'big') + key_bytes
         b += blake256(b)[:4]
         return b58encode(b)
 
@@ -433,7 +438,7 @@ class DCRInterface(Secp256k1Interface):
         script_hash = self.pkh(script)
         assert len(script_hash) == 20
 
-        return OP_HASH160.to_bytes(1) + len(script_hash).to_bytes(1) + script_hash + OP_EQUAL.to_bytes(1)
+        return bytes((OP_HASH160,)) + bytes((len(script_hash),)) + script_hash + bytes((OP_EQUAL,))
 
     def encodeScriptDest(self, script_dest: bytes) -> str:
         script_hash = script_dest[2:-1]  # Extract hash from script
@@ -442,7 +447,7 @@ class DCRInterface(Secp256k1Interface):
     def getPubkeyHashDest(self, pkh: bytes) -> bytes:
         # P2PKH
         assert len(pkh) == 20
-        return OP_DUP.to_bytes(1) + OP_HASH160.to_bytes(1) + len(pkh).to_bytes(1) + pkh + OP_EQUALVERIFY.to_bytes(1) + OP_CHECKSIG.to_bytes(1)
+        return bytes((OP_DUP,)) + bytes((OP_HASH160,)) + bytes((len(pkh),)) + pkh + bytes((OP_EQUALVERIFY,)) + bytes((OP_CHECKSIG,))
 
     def getPkDest(self, K: bytes) -> bytearray:
         return self.getPubkeyHashDest(self.pkh(K))
@@ -532,7 +537,7 @@ class DCRInterface(Secp256k1Interface):
             prove_utxos.append(outpoint)
             hasher.update(outpoint[0])
             hasher.update(outpoint[1].to_bytes(2, 'big'))
-            hasher.update(outpoint[2].to_bytes(1))
+            hasher.update(outpoint[2].to_bytes(1, 'big'))
             if sum_value >= amount_for:
                 break
         utxos_hash = hasher.digest()
@@ -554,7 +559,7 @@ class DCRInterface(Secp256k1Interface):
     def encodeProofUtxos(self, proof_utxos):
         packed_utxos = bytes()
         for utxo in proof_utxos:
-            packed_utxos += utxo[0] + utxo[1].to_bytes(2, 'big') + utxo[2].to_bytes(1)
+            packed_utxos += utxo[0] + utxo[1].to_bytes(2, 'big') + utxo[2].to_bytes(1, 'big')
         return packed_utxos
 
     def decodeProofUtxos(self, msg_utxos):
@@ -573,7 +578,7 @@ class DCRInterface(Secp256k1Interface):
         for outpoint in utxos:
             hasher.update(outpoint[0])
             hasher.update(outpoint[1].to_bytes(2, 'big'))
-            hasher.update(outpoint[2].to_bytes(1))
+            hasher.update(outpoint[2].to_bytes(1, 'big'))
         utxos_hash = hasher.digest()
 
         passed = self.verifyMessage(address, address + '_swap_proof_' + utxos_hash.hex() + extra_commit_bytes.hex(), signature)
@@ -841,19 +846,19 @@ class DCRInterface(Secp256k1Interface):
         Kaf_enc = Kaf if len(Kaf) == 33 else self.encodePubkey(Kaf)
 
         script = bytearray()
-        script += OP_IF.to_bytes(1)
+        script += bytes((OP_IF,))
         push_script_data(script, bytes((2,)))
         push_script_data(script, Kal_enc)
         push_script_data(script, Kaf_enc)
         push_script_data(script, bytes((2,)))
-        script += OP_CHECKMULTISIG.to_bytes(1)
-        script += OP_ELSE.to_bytes(1)
+        script += bytes((OP_CHECKMULTISIG,))
+        script += bytes((OP_ELSE,))
         script += CScriptNum.encode(CScriptNum(csv_val))
-        script += OP_CHECKSEQUENCEVERIFY.to_bytes(1)
-        script += OP_DROP.to_bytes(1)
+        script += bytes((OP_CHECKSEQUENCEVERIFY,))
+        script += bytes((OP_DROP,))
         push_script_data(script, Kaf_enc)
-        script += OP_CHECKSIG.to_bytes(1)
-        script += OP_ENDIF.to_bytes(1)
+        script += bytes((OP_CHECKSIG,))
+        script += bytes((OP_ENDIF,))
 
         return script
 

basicswap/interface/dcr/messages.py

@@ -162,7 +162,7 @@ class CTransaction:
             for txi in self.vin:
                 data += txi.prevout.hash.to_bytes(32, 'little')
                 data += txi.prevout.n.to_bytes(4, 'little')
-                data += txi.prevout.tree.to_bytes(1)
+                data += txi.prevout.tree.to_bytes(1, 'little')
                 data += txi.sequence.to_bytes(4, 'little')
 
             data += encode_compactsize(len(self.vout))

basicswap/interface/dcr/script.py

@@ -39,7 +39,7 @@ def push_script_data(data_array: bytearray, data: bytes) -> None:
         return
 
     if len_data < OP_PUSHDATA1:
-        data_array += len_data.to_bytes(1)
+        data_array += len_data.to_bytes(1, 'little')
     elif len_data <= 0xff:
         data_array += bytes((OP_PUSHDATA1, len_data))
     elif len_data <= 0xffff:

basicswap/interface/dcr/util.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2024 tecnovert
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+import os
+import select
+import subprocess
+
+
+def createDCRWallet(args, hex_seed, logging, delay_event):
+    logging.info('Creating DCR wallet')
+    (pipe_r, pipe_w) = os.pipe()  # subprocess.PIPE is buffered, blocks when read
+    p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=pipe_w, stderr=pipe_w)
+
+    try:
+        while p.poll() is None:
+            while len(select.select([pipe_r], [], [], 0)[0]) == 1:
+                buf = os.read(pipe_r, 1024).decode('utf-8')
+                logging.debug(f'dcrwallet {buf}')
+                response = None
+                if 'Use the existing configured private passphrase' in buf:
+                    response = b'y\n'
+                elif 'Do you want to add an additional layer of encryption' in buf:
+                    response = b'n\n'
+                elif 'Do you have an existing wallet seed' in buf:
+                    response = b'y\n'
+                elif 'Enter existing wallet seed' in buf:
+                    response = (hex_seed + '\n').encode('utf-8')
+                elif 'Seed input successful' in buf:
+                    pass
+                elif 'Upgrading database from version' in buf:
+                    pass
+                elif 'Ticket commitments db upgrade done' in buf:
+                    pass
+                else:
+                    raise ValueError(f'Unexpected output: {buf}')
+                if response is not None:
+                    p.stdin.write(response)
+                    p.stdin.flush()
+            delay_event.wait(0.1)
+    except Exception as e:
+        logging.error(f'dcrwallet --create failed: {e}')
+    finally:
+        if p.poll() is None:
+            p.terminate()
+        os.close(pipe_r)
+        os.close(pipe_w)
+        p.stdin.close()

basicswap/interface/firo.py

@@ -42,9 +42,6 @@ class FIROInterface(BTCInterface):
         # No multiwallet support
         self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)
 
-    def checkWallets(self) -> int:
-        return 1
-
     def getExchangeName(self, exchange_name):
         return 'zcoin'
 

basicswap/interface/nav.py

@@ -73,9 +73,6 @@ class NAVInterface(BTCInterface):
         # No multiwallet support
         self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)
 
-    def checkWallets(self) -> int:
-        return 1
-
     def use_p2shp2wsh(self) -> bool:
         # p2sh-p2wsh
         return True

basicswap/interface/pivx.py

@@ -35,9 +35,6 @@ class PIVXInterface(BTCInterface):
         # No multiwallet support
         self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host)
 
-    def checkWallets(self) -> int:
-        return 1
-
     def signTxWithWallet(self, tx):
         rv = self.rpc('signrawtransaction', [tx.hex()])
         return bytes.fromhex(rv['hex'])

basicswap/interface/xmr.py

@@ -129,9 +129,6 @@ class XMRInterface(CoinInterface):
         self.rpc2 = make_xmr_rpc2_func(coin_settings['rpcport'], daemon_login, host=rpchost, proxy_host=proxy_host, proxy_port=proxy_port, default_timeout=self._rpctimeout, tag='Node ')  # non-json endpoint
         self.rpc_wallet = make_xmr_rpc_func(coin_settings['walletrpcport'], coin_settings['walletrpcauth'], host=coin_settings.get('walletrpchost', '127.0.0.1'), default_timeout=self._walletrpctimeout, tag='Wallet ')
 
-    def checkWallets(self) -> int:
-        return 1
-
     def setFeePriority(self, new_priority):
         ensure(new_priority >= 0 and new_priority < 4, 'Invalid fee_priority value')
         self._fee_priority = new_priority