Add bid intent messages.

basicswap/interface/btc.py

@@ -318,6 +318,27 @@ class BTCInterface(CoinInterface):
             args.append('bech32')
         return self.rpc_callback('getnewaddress', args)
 
+    def isValidAddress(self, address: str) -> bool:
+        try:
+            rv = self.rpc_callback('validateaddress', [address])
+            if rv['isvalid'] is True:
+                return True
+        except Exception as ex:
+            self._log.debug('validateaddress failed: {}'.format(address))
+        return False
+
+    def isValidAddressHash(self, address_hash: bytes) -> bool:
+        hash_len = len(address_hash)
+        if hash_len == 20:
+            return True
+
+    def isValidPubkey(self, pubkey: bytes) -> bool:
+        try:
+            self.verifyPubkey(pubkey)
+            return True
+        except Exception:
+            return False
+
     def isAddressMine(self, address: str, or_watch_only: bool = False) -> bool:
         addr_info = self.rpc_callback('getaddressinfo', [address])
         if not or_watch_only:
@@ -1434,6 +1455,10 @@ class BTCInterface(CoinInterface):
         tx.rehash()
         return tx.serialize().hex()
 
+    def ensureFunds(self, amount):
+        if self.getSpendableBalance() < amount:
+            raise ValueError('Balance too low')
+
 
 def testBTCInterface():
     print('TODO: testBTCInterface')

basicswap/interface/dash.py

@@ -55,7 +55,7 @@ class DASHInterface(BTCInterface):
         params = [addr_to, value, '', '', subfee, False, False, self._conf_target]
         return self.rpc_callback('sendtoaddress', params)
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
         return self.make_int(self.rpc_callback('getwalletinfo')['balance'])
 
     def getScriptForPubkeyHash(self, pkh: bytes) -> bytearray:

basicswap/interface/firo.py

@@ -181,7 +181,7 @@ class FIROInterface(BTCInterface):
     def getWalletSeedID(self):
         return self.rpc_callback('getwalletinfo')['hdmasterkeyid']
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
         return self.make_int(self.rpc_callback('getwalletinfo')['balance'])
 
     def getBLockSpendTxFee(self, tx, fee_rate: int) -> int:

basicswap/interface/part.py

@@ -131,15 +131,6 @@ class PARTInterface(BTCInterface):
         block_header = self.rpc_callback('getblockheader', [block_hash])
         return block_header['height']
 
-    def isValidAddress(self, address: str) -> bool:
-        try:
-            rv = self.rpc_callback('validateaddress', [address])
-            if rv['isvalid'] is True:
-                return True
-        except Exception as ex:
-            self._log.debug('validateaddress failed: {}'.format(address))
-        return False
-
 
 class PARTInterfaceBlind(PARTInterface):
     @staticmethod
@@ -648,7 +639,7 @@ class PARTInterfaceBlind(PARTInterface):
         txid = self.rpc_callback('sendtypeto', params)
         return bytes.fromhex(txid)
 
-    def findTxB(self, kbv, Kbs, cb_swap_value, cb_block_confirmed, restore_height, bid_sender):
+    def findTxB(self, kbv, Kbs, cb_swap_value, cb_block_confirmed, restore_height: int, bid_sender: bool):
         Kbv = self.getPubkey(kbv)
         sx_addr = self.formatStealthAddress(Kbv, Kbs)
 

basicswap/interface/pivx.py

@@ -79,7 +79,7 @@ class PIVXInterface(BTCInterface):
         params = [addr_to, value, '', '', subfee]
         return self.rpc_callback('sendtoaddress', params)
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
         return self.make_int(self.rpc_callback('getwalletinfo')['balance'])
 
     def loadTx(self, tx_bytes):

basicswap/interface/xmr.py

@@ -480,7 +480,7 @@ class XMRInterface(CoinInterface):
             except Exception as e:
                 return {'error': str(e)}
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
         with self._mx_wallet:
             self.openWallet(self._wallet_filename)
 
@@ -514,3 +514,7 @@ class XMRInterface(CoinInterface):
     def isAddressMine(self, address):
         # TODO
         return True
+
+    def ensureFunds(self, amount):
+        if self.getSpendableBalance() < amount:
+            raise ValueError('Balance too low')