Add incoming mweb->plain amounts to unconfirmed balance

basicswap-prepare will set trusted_daemon true if the daemon host address is a local ip address else false.
Override with --trustremotenode
--trustremotenode can be used with --enabletor

.cirrus.yml

@@ -24,7 +24,7 @@ test_task:
     - apt-get install -y wget python3-pip gnupg unzip protobuf-compiler automake libtool pkg-config
     - pip install tox pytest
     - python3 setup.py install
-    - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.1.zip
+    - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip
     - unzip -d coincurve-anonswap coincurve-anonswap.zip
     - mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true
     - cd coincurve-anonswap
@@ -47,3 +47,4 @@ test_task:
     - pytest tests/basicswap/test_other.py
     - pytest tests/basicswap/test_run.py
     - pytest tests/basicswap/test_reload.py
+    - pytest tests/basicswap/test_btc_xmr.py -k 'test_01_a or test_01_b or test_02_a or test_02_b'

.gitignore

@@ -1,4 +1,5 @@
 old/
+build/
 *.pyc
 __pycache__
 /dist/
@@ -8,3 +9,6 @@ __pycache__
 .tox
 .eggs
 *~
+
+# geckodriver.log
+*.log

.travis.yml

@@ -22,7 +22,7 @@ before_install:
 install:
   - travis_retry pip install tox pytest
 before_script:
-  - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.1.zip
+  - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip
   - unzip -d coincurve-anonswap coincurve-anonswap.zip
   - mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true
   - cd coincurve-anonswap

Dockerfile

@@ -15,7 +15,7 @@ RUN wget -O protobuf_src.tar.gz https://github.com/protocolbuffers/protobuf/rele
     make -j$(nproc) install && \
     ldconfig
 
-ARG COINCURVE_VERSION=v0.1
+ARG COINCURVE_VERSION=v0.2
 RUN wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_$COINCURVE_VERSION.zip && \
     unzip coincurve-anonswap.zip && \
     mv ./coincurve-anonswap_$COINCURVE_VERSION ./coincurve-anonswap && \

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2019 tecnovert
+Copyright (c) 2019-2024 tecnovert
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,20 +1,131 @@
+# BasicSwap DEX (BSX)
 
-# Simple Atomic Swap Network - Proof of Concept
+![BasicswapDEX Preview](.github-readme/basicswap_header.jpg)
 
-## Overview
+**[Official Website](https://basicswapdex.com)** | **[News](https://particl.news)** | **[Tutorials](https://academy.particl.io)** | **[Chat]( https://matrix.to/#/#basicswap:matrix.org )**
 
-Simple atomic swap experiment, doesn't have many interesting features yet.
+Table of Contents
-Not ready for real world use.
 
-Uses Particl secure messaging and Decred style atomic swaps.
+* [About](#about)
+* [Features](#features)
+* [Available Assets](#available-assets)
+* [Participate](#participate)
+* [Tutorials](#tutorials)
+* [License](#license)
 
-The Particl node is used to hold the keys and sign for the swap transactions.
+## About
-Other nodes can be run in pruned mode.
-A node must be run for each coin type traded.
-In the future it should be possible to use data from explorers instead of running a node.
 
-## Currently a work in progress
+The BasicSwap DEX is a privacy-first and decentralized exchange which features cross-chain atomic swaps and a distributed order book.
 
-Not ready for real-world use.
+[BasicSwap](https://academy.particl.io/en/latest/glossary.html#term-BasicSwap) is a cross-chain and privacy-centric DEX (decentralized exchange) that lets you trade cryptocurrencies with no third party involvement. Its distributed order book lets you make or take orders at no cost and trade within a free and open environment without central points of failure.
 
-Discuss development and help with testing in the matrix channel [#basicswap:matrix.org](https://riot.im/app/#/room/#basicswap:matrix.org)
+This DEX protocol was built in direct response to the increasingly invasive demands and data mining practices of today’s cryptocurrency exchanges. It strives to bring more decentralized and more private cryptocurrency trading conditions for all.
+
+BasicSwap is still in beta. This means that, while it already offers most of the vital trading features you’d expect to see on centralized exchanges, it is still in heavy development, and many more features will come about in the near future.
+
+Check out our [roadmap](https://basicswapdex.com/roadmap) to get a better idea of what we've got planned for it!
+
+## Features
+
+* **True cross-chain support** — Swap cryptocurrencies that live on entirely different blockchain environments, like Bitcoin and Monero.
+* **Distributed order book** — Make or take limit orders on a completely distributed order book system.
+* **No third-party or middleman** — Trade crypto with no intermediaries whatsoever.
+* **No trading fees** — Only pay the typical cryptocurrency network fee.
+* **Privacy from the ground up** — Every component of BasicSwap is built with a privacy-first commitment.
+* **Full Monero support** — Swap Monero with a variety of other cryptocurrencies like Bitcoin or Particl. No wrapped assets or trickery involved.
+* **User-friendly interface** — Enjoy all these features within a user-friendly and intuitive interface that handles all the complicated parts for you.
+
+BasicSwap is still in beta. This means that, while it already offers most of the vital trading features you’d expect to see on centralized exchanges, it is still in heavy development, and many more features will come about in the near future.
+
+## Available Assets
+
+BasicSwap is compatible with the following digital assets.
+
+<table>
+  <tr>
+   <td><strong>Coin Name</strong>
+   </td>
+   <td><strong>Ticker</strong>
+   </td>
+  </tr>
+  <tr>
+   <td>Bitcoin
+   </td>
+   <td>BTC
+   </td>
+  </tr>
+  <tr>
+   <td>Monero
+   </td>
+   <td>XMR
+   </td>
+  </tr>
+  <tr>
+   <td>Dash
+   </td>
+   <td>DASH
+   </td>
+  </tr>
+  <tr>
+   <td>Litecoin
+   </td>
+   <td>LTC
+   </td>
+  </tr>
+  <tr>
+   <td>Firo
+   </td>
+   <td>FIRO
+   </td>
+  </tr>
+  <tr>
+   <td>PIVX
+   </td>
+   <td>PIVX
+   </td>
+  </tr>
+  <tr>
+   <td>Particl
+   </td>
+   <td>PART
+   </td>
+  </tr>
+</table>
+
+We plan on adding many other cryptocurrencies moving forward, including ETH and its ERC-20 tokens. However, due to the true cross-chain nature of the BasicSwap DEX protocol, each integration has to be done on a case-by-case basis.
+
+If you’d like to add a cryptocurrency to BasicSwap, either [apply for a listing using our listing application form](https://forms.gle/9DsHoHTJVqSiMNHW9), or try coding the integration yourself by referencing how other cryptocurrencies have been added. Follow [this link](https://academy.particl.io/en/latest/basicswap-guides/basicswapguides_apply.html) for more information on how to integrate a coin yourself.
+
+# Participate
+
+### Chats
+
+* **For developers** The chat [#particl-dev:matrix.org](https://app.element.io/#/room/#particl-dev:matrix.org) using [Element](https://element.io) (formerly Riot).
+* **For community** The community chat [https://discord.me/particl](https://discord.me/particl) [![Discord](https://img.shields.io/discord/391967609660112925)](https://discord.me/particl).
+
+[![Twitter Follow](https://img.shields.io/twitter/follow/BasicSwapDEX?label=follow%20us&style=social)](http://twitter.com/BasicSwapDEX)
+[![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/particl?style=social)](http://reddit.com/r/particl)
+
+### Documentation, installation
+
+For non-developers curious to explore a new world of commerce, binaries can be downloaded and installed. It is the easiest way to get started. Following the guides on [Particl Academy](https://academy.particl.io), a reference book in straightforward language, is recommended.
+
+* [Download BasicSwapDEX](https://github.com/tecnovert/basicswap/tree/master/doc)
+
+#### Community chat support
+
+* [Discord](https://discord.me/particl) navigate to the #support channel
+
+* [Telegram](https://t.me/particlhelp)
+
+* [Element](https://app.element.io/#/room/#particlhelp:matrix.org)
+
+# Tutorials
+
+You can find a wide variety of tutorials and step-by-step guides about BasicSwap on the [Particl Academy](https://academy.particl.io) or on Particl’s Youtube channel.
+
+If you encounter an issue or try to accomplish something not mentioned in any of the tutorials included in the links above, please join the community chat support channels; you’ll be sure to find help and support from our awesome community and open-source team there!
+
+# License
+
+BasicSwap is released under MIT software license.

basicswap/__init__.py

@@ -1,3 +1,3 @@
 name = "basicswap"
 
-__version__ = "0.11.40"
+__version__ = "0.12.7"

basicswap/base.py

@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2022 tecnovert
+# Copyright (c) 2019-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 time
 import shlex
 import socks
+import random
 import socket
 import urllib
 import logging
 import threading
+import traceback
 import subprocess
 
-import basicswap.config as cfg
+from sockshandler import SocksiPyHandler
-import basicswap.contrib.segwit_addr as segwit_addr
 
 from .rpc import (
     callrpc,
@@ -36,8 +38,8 @@ class BaseApp:
     def __init__(self, fp, data_dir, settings, chain, log_name='BasicSwap'):
         self.log_name = log_name
         self.fp = fp
-        self.is_running = True
         self.fail_code = 0
+        self.mock_time_offset = 0
 
         self.data_dir = data_dir
         self.chain = chain
@@ -47,6 +49,8 @@ class BaseApp:
         self.mxDB = threading.RLock()
         self.debug = self.settings.get('debug', False)
         self.delay_event = threading.Event()
+        self.chainstate_delay_event = threading.Event()
+
         self._network = None
         self.prepareLogging()
         self.log.info('Network: {}'.format(self.chain))
@@ -63,7 +67,7 @@ class BaseApp:
     def stopRunning(self, with_code=0):
         self.fail_code = with_code
         with self.mxDB:
-            self.is_running = False
+            self.chainstate_delay_event.set()
             self.delay_event.set()
 
     def prepareLogging(self):
@@ -73,10 +77,10 @@ class BaseApp:
         # Remove any existing handlers
         self.log.handlers = []
 
-        formatter = logging.Formatter('%(asctime)s %(levelname)s : %(message)s')
+        formatter = logging.Formatter('%(asctime)s %(levelname)s : %(message)s', '%Y-%m-%d %H:%M:%S')
         stream_stdout = logging.StreamHandler()
         if self.log_name != 'BasicSwap':
-            stream_stdout.setFormatter(logging.Formatter('%(asctime)s %(name)s %(levelname)s : %(message)s'))
+            stream_stdout.setFormatter(logging.Formatter('%(asctime)s %(name)s %(levelname)s : %(message)s', '%Y-%m-%d %H:%M:%S'))
         else:
             stream_stdout.setFormatter(formatter)
         stream_fp = logging.StreamHandler(self.fp)
@@ -92,7 +96,7 @@ class BaseApp:
         except Exception:
             return {}
 
-    def setDaemonPID(self, name, pid):
+    def setDaemonPID(self, name, pid) -> None:
         if isinstance(name, Coins):
             self.coin_clients[name]['pid'] = pid
             return
@@ -100,23 +104,17 @@ class BaseApp:
             if v['name'] == name:
                 v['pid'] = pid
 
-    def getChainDatadirPath(self, coin):
+    def getChainDatadirPath(self, coin) -> str:
         datadir = self.coin_clients[coin]['datadir']
         testnet_name = '' if self.chain == 'mainnet' else chainparams[coin][self.chain].get('name', self.chain)
         return os.path.join(datadir, testnet_name)
 
-    def getCoinIdFromName(self, coin_name):
+    def getCoinIdFromName(self, coin_name: str):
         for c, params in chainparams.items():
             if coin_name.lower() == params['name'].lower():
                 return c
         raise ValueError('Unknown coin: {}'.format(coin_name))
 
-    def encodeSegwit(self, coin_type, raw):
-        return segwit_addr.encode(chainparams[coin_type][self.chain]['hrp'], 0, raw)
-
-    def decodeSegwit(self, coin_type, addr):
-        return bytes(segwit_addr.decode(chainparams[coin_type][self.chain]['hrp'], addr)[1])
-
     def callrpc(self, method, params=[], wallet=None):
         cc = self.coin_clients[Coins.PART]
         return callrpc(cc['rpcport'], cc['rpcauth'], method, params, wallet, cc['rpchost'])
@@ -125,18 +123,6 @@ class BaseApp:
         cc = self.coin_clients[coin]
         return callrpc(cc['rpcport'], cc['rpcauth'], method, params, wallet, cc['rpchost'])
 
-    def calltx(self, cmd):
-        bindir = self.coin_clients[Coins.PART]['bindir']
-        args = [os.path.join(bindir, cfg.PARTICL_TX), ]
-        if self.chain != 'mainnet':
-            args.append('-' + self.chain)
-        args += shlex.split(cmd)
-        p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out = p.communicate()
-        if len(out[1]) > 0:
-            raise ValueError('TX error ' + str(out[1]))
-        return out[0].decode('utf-8').strip()
-
     def callcoincli(self, coin_type, params, wallet=None, timeout=None):
         bindir = self.coin_clients[coin_type]['bindir']
         datadir = self.coin_clients[coin_type]['datadir']
@@ -152,7 +138,7 @@ class BaseApp:
             raise ValueError('CLI error ' + str(out[1]))
         return out[0].decode('utf-8').strip()
 
-    def is_transient_error(self, ex):
+    def is_transient_error(self, ex) -> bool:
         if isinstance(ex, TemporaryError):
             return True
         str_error = str(ex).lower()
@@ -170,12 +156,26 @@ class BaseApp:
 
         socket.setdefaulttimeout(timeout)
 
-    def popConnectionParameters(self):
+    def popConnectionParameters(self) -> None:
         if self.use_tor_proxy:
             socket.socket = self.default_socket
             socket.getaddrinfo = self.default_socket_getaddrinfo
         socket.setdefaulttimeout(self.default_socket_timeout)
 
+    def readURL(self, url: str, timeout: int = 120, headers=None) -> bytes:
+        open_handler = None
+        if self.use_tor_proxy:
+            open_handler = SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, self.tor_proxy_host, self.tor_proxy_port)
+        opener = urllib.request.build_opener(open_handler) if self.use_tor_proxy else urllib.request.build_opener()
+        opener.addheaders = [('User-agent', 'Mozilla/5.0')]
+        request = urllib.request.Request(url, headers=headers)
+        return opener.open(request, timeout=timeout).read()
+
+    def logException(self, message) -> None:
+        self.log.error(message)
+        if self.debug:
+            self.log.error(traceback.format_exc())
+
     def torControl(self, query):
         try:
             command = 'AUTHENTICATE "{}"\r\n{}\r\nQUIT\r\n'.format(self.tor_control_password, query).encode('utf-8')
@@ -192,3 +192,35 @@ class BaseApp:
         except Exception as e:
             self.log.error(f'torControl {e}')
             return
+
+    def getTime(self) -> int:
+        return int(time.time()) + self.mock_time_offset
+
+    def setMockTimeOffset(self, new_offset: int) -> None:
+        self.log.warning(f'Setting mocktime to {new_offset}')
+        self.mock_time_offset = new_offset
+
+    def get_int_setting(self, name: str, default_v: int, min_v: int, max_v) -> int:
+        value: int = self.settings.get(name, default_v)
+        if value < min_v:
+            self.log.warning(f'Setting {name} to {min_v}')
+            value = min_v
+        if value > max_v:
+            self.log.warning(f'Setting {name} to {max_v}')
+            value = max_v
+        return value
+
+    def get_delay_event_seconds(self):
+        if self.min_delay_event == self.max_delay_event:
+            return self.min_delay_event
+        return random.randrange(self.min_delay_event, self.max_delay_event)
+
+    def get_short_delay_event_seconds(self):
+        if self.min_delay_event_short == self.max_delay_event_short:
+            return self.min_delay_event_short
+        return random.randrange(self.min_delay_event_short, self.max_delay_event_short)
+
+    def get_delay_retry_seconds(self):
+        if self.min_delay_retry == self.max_delay_retry:
+            return self.min_delay_retry
+        return random.randrange(self.min_delay_retry, self.max_delay_retry)

basicswap/basicswap_util.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2021-2022 tecnovert
+# Copyright (c) 2021-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -9,8 +9,8 @@ import struct
 import hashlib
 from enum import IntEnum, auto
 from .util.address import (
-    decodeAddress,
     encodeAddress,
+    decodeAddress,
 )
 from .chainparams import (
     chainparams,
@@ -47,6 +47,9 @@ class MessageTypes(IntEnum):
     XMR_BID_LOCK_RELEASE_LF = auto()
     OFFER_REVOKE = auto()
 
+    ADS_BID_LF = auto()
+    ADS_BID_ACCEPT_FL = auto()
+
 
 class AddressTypes(IntEnum):
     OFFER = auto()
@@ -98,6 +101,8 @@ class BidStates(IntEnum):
     BID_STATE_UNKNOWN = 26
     XMR_SWAP_MSG_SCRIPT_LOCK_TX_SIGS = 27      # XmrBidLockTxSigsMessage
     XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX = 28     # XmrBidLockSpendTxMessage
+    BID_REQUEST_SENT = 29
+    BID_REQUEST_ACCEPTED = 30
 
 
 class TxStates(IntEnum):
@@ -106,6 +111,8 @@ class TxStates(IntEnum):
     TX_CONFIRMED = auto()
     TX_REDEEMED = auto()
     TX_REFUNDED = auto()
+    TX_IN_MEMPOOL = auto()
+    TX_IN_CHAIN = auto()
 
 
 class TxTypes(IntEnum):
@@ -122,6 +129,10 @@ class TxTypes(IntEnum):
     XMR_SWAP_A_LOCK_REFUND_SPEND = auto()
     XMR_SWAP_A_LOCK_REFUND_SWIPE = auto()
     XMR_SWAP_B_LOCK = auto()
+    XMR_SWAP_B_LOCK_SPEND = auto()
+    XMR_SWAP_B_LOCK_REFUND = auto()
+
+    ITX_PRE_FUNDED = auto()
 
 
 class ActionTypes(IntEnum):
@@ -136,6 +147,7 @@ class ActionTypes(IntEnum):
     RECOVER_XMR_SWAP_LOCK_TX_B = auto()
     SEND_XMR_SWAP_LOCK_SPEND_MSG = auto()
     REDEEM_ITX = auto()
+    ACCEPT_AS_REV_BID = auto()
 
 
 class EventLogTypes(IntEnum):
@@ -162,6 +174,13 @@ class EventLogTypes(IntEnum):
     ERROR = auto()
     AUTOMATION_CONSTRAINT = auto()
     AUTOMATION_ACCEPTING_BID = auto()
+    ITX_PUBLISHED = auto()
+    ITX_REDEEM_PUBLISHED = auto()
+    ITX_REFUND_PUBLISHED = auto()
+    PTX_PUBLISHED = auto()
+    PTX_REDEEM_PUBLISHED = auto()
+    PTX_REFUND_PUBLISHED = auto()
+    LOCK_TX_B_IN_MEMPOOL = auto()
 
 
 class XmrSplitMsgTypes(IntEnum):
@@ -178,6 +197,48 @@ class DebugTypes(IntEnum):
     MAKE_INVALID_PTX = auto()
     DONT_SPEND_ITX = auto()
     SKIP_LOCK_TX_REFUND = auto()
+    SEND_LOCKED_XMR = auto()
+    B_LOCK_TX_MISSED_SEND = auto()
+    DUPLICATE_ACTIONS = auto()
+
+
+class NotificationTypes(IntEnum):
+    NONE = 0
+    OFFER_RECEIVED = auto()
+    BID_RECEIVED = auto()
+    BID_ACCEPTED = auto()
+
+
+class AutomationOverrideOptions(IntEnum):
+    DEFAULT = 0
+    ALWAYS_ACCEPT = 1
+    NEVER_ACCEPT = auto()
+
+
+def strAutomationOverrideOption(option):
+    if option == AutomationOverrideOptions.DEFAULT:
+        return 'Default'
+    if option == AutomationOverrideOptions.ALWAYS_ACCEPT:
+        return 'Always Accept'
+    if option == AutomationOverrideOptions.NEVER_ACCEPT:
+        return 'Never Accept'
+    return 'Unknown'
+
+
+class VisibilityOverrideOptions(IntEnum):
+    DEFAULT = 0
+    HIDE = 1
+    BLOCK = auto()
+
+
+def strVisibilityOverrideOption(option):
+    if option == VisibilityOverrideOptions.DEFAULT:
+        return 'Default'
+    if option == VisibilityOverrideOptions.HIDE:
+        return 'Hide'
+    if option == VisibilityOverrideOptions.BLOCK:
+        return 'Block'
+    return 'Unknown'
 
 
 def strOfferState(state):
@@ -190,13 +251,6 @@ def strOfferState(state):
     return 'Unknown'
 
 
-class NotificationTypes(IntEnum):
-    NONE = 0
-    OFFER_RECEIVED = auto()
-    BID_RECEIVED = auto()
-    BID_ACCEPTED = auto()
-
-
 def strBidState(state):
     if state == BidStates.BID_SENT:
         return 'Sent'
@@ -252,6 +306,13 @@ def strBidState(state):
         return 'Exchanged script lock tx sigs msg'
     if state == BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX:
         return 'Exchanged script lock spend tx msg'
+    if state == BidStates.BID_REQUEST_SENT:
+        return 'Request sent'
+    if state == BidStates.BID_REQUEST_ACCEPTED:
+        return 'Request accepted'
+    if state == BidStates.BID_STATE_UNKNOWN:
+        return 'Unknown bid state'
+
     return 'Unknown' + ' ' + str(state)
 
 
@@ -266,6 +327,10 @@ def strTxState(state):
         return 'Redeemed'
     if state == TxStates.TX_REFUNDED:
         return 'Refunded'
+    if state == TxStates.TX_IN_MEMPOOL:
+        return 'In Mempool'
+    if state == TxStates.TX_IN_CHAIN:
+        return 'In Chain'
     return 'Unknown'
 
 
@@ -282,6 +347,8 @@ def strTxType(tx_type):
         return 'Chain A Lock Refund Swipe Tx'
     if tx_type == TxTypes.XMR_SWAP_B_LOCK:
         return 'Chain B Lock Tx'
+    if tx_type == TxTypes.ITX_PRE_FUNDED:
+        return 'Funded mock initiate tx'
     return 'Unknown'
 
 
@@ -309,8 +376,6 @@ def getLockName(lock_type):
 
 
 def describeEventEntry(event_type, event_msg):
-    if event_type == EventLogTypes.FAILED_TX_B_LOCK_PUBLISH:
-        return 'Failed to publish lock tx B'
     if event_type == EventLogTypes.FAILED_TX_B_LOCK_PUBLISH:
         return 'Failed to publish lock tx B'
     if event_type == EventLogTypes.LOCK_TX_A_PUBLISHED:
@@ -327,6 +392,8 @@ def describeEventEntry(event_type, event_msg):
         return 'Lock tx B seen in chain'
     if event_type == EventLogTypes.LOCK_TX_B_CONFIRMED:
         return 'Lock tx B confirmed in chain'
+    if event_type == EventLogTypes.LOCK_TX_B_IN_MEMPOOL:
+        return 'Lock tx B seen in mempool'
     if event_type == EventLogTypes.DEBUG_TWEAK_APPLIED:
         return 'Debug tweak applied ' + event_msg
     if event_type == EventLogTypes.FAILED_TX_B_REFUND:
@@ -357,11 +424,25 @@ def describeEventEntry(event_type, event_msg):
         return 'Failed auto accepting'
     if event_type == EventLogTypes.AUTOMATION_ACCEPTING_BID:
         return 'Auto accepting'
+    if event_type == EventLogTypes.ITX_PUBLISHED:
+        return 'Initiate tx published'
+    if event_type == EventLogTypes.ITX_REDEEM_PUBLISHED:
+        return 'Initiate tx redeem tx published'
+    if event_type == EventLogTypes.ITX_REFUND_PUBLISHED:
+        return 'Initiate tx refund tx published'
+    if event_type == EventLogTypes.PTX_PUBLISHED:
+        return 'Participate tx published'
+    if event_type == EventLogTypes.PTX_REDEEM_PUBLISHED:
+        return 'Participate tx redeem tx published'
+    if event_type == EventLogTypes.PTX_REFUND_PUBLISHED:
+        return 'Participate tx refund tx published'
 
 
 def getVoutByAddress(txjs, p2sh):
     for o in txjs['vout']:
         try:
+            if 'address' in o['scriptPubKey'] and o['scriptPubKey']['address'] == p2sh:
+                return o['n']
             if p2sh in o['scriptPubKey']['addresses']:
                 return o['n']
         except Exception:
@@ -369,14 +450,14 @@ def getVoutByAddress(txjs, p2sh):
     raise ValueError('Address output not found in txn')
 
 
-def getVoutByP2WSH(txjs, p2wsh_hex):
+def getVoutByScriptPubKey(txjs, scriptPubKey_hex: str) -> int:
     for o in txjs['vout']:
         try:
-            if p2wsh_hex == o['scriptPubKey']['hex']:
+            if scriptPubKey_hex == o['scriptPubKey']['hex']:
                 return o['n']
         except Exception:
             pass
-    raise ValueError('P2WSH output not found in txn')
+    raise ValueError('scriptPubKey output not found in txn')
 
 
 def replaceAddrPrefix(addr, coin_type, chain_name, addr_type='pubkey_address'):
@@ -406,27 +487,62 @@ def getLastBidState(packed_states):
         return BidStates.BID_STATE_UNKNOWN
 
 
+def strSwapType(swap_type):
+    if swap_type == SwapTypes.SELLER_FIRST:
+        return 'seller_first'
+    if swap_type == SwapTypes.XMR_SWAP:
+        return 'xmr_swap'
+    return None
+
+
+def strSwapDesc(swap_type):
+    if swap_type == SwapTypes.SELLER_FIRST:
+        return 'Secret Hash'
+    if swap_type == SwapTypes.XMR_SWAP:
+        return 'Adaptor Sig'
+    return None
+
+
+inactive_states = [BidStates.SWAP_COMPLETED, BidStates.BID_ERROR, BidStates.BID_REJECTED, BidStates.SWAP_TIMEDOUT, BidStates.BID_ABANDONED]
+
+
 def isActiveBidState(state):
     if state >= BidStates.BID_ACCEPTED and state < BidStates.SWAP_COMPLETED:
         return True
-    if state == BidStates.SWAP_DELAYING:
+    return state in (
-        return True
+        BidStates.SWAP_DELAYING,
-    if state == BidStates.XMR_SWAP_HAVE_SCRIPT_COIN_SPEND_TX:
+        BidStates.XMR_SWAP_HAVE_SCRIPT_COIN_SPEND_TX,
-        return True
+        BidStates.XMR_SWAP_SCRIPT_COIN_LOCKED,
-    if state == BidStates.XMR_SWAP_SCRIPT_COIN_LOCKED:
+        BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED,
-        return True
+        BidStates.XMR_SWAP_LOCK_RELEASED,
-    if state == BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED:
+        BidStates.XMR_SWAP_NOSCRIPT_TX_REDEEMED,
-        return True
+        BidStates.XMR_SWAP_SCRIPT_TX_REDEEMED,
-    if state == BidStates.XMR_SWAP_LOCK_RELEASED:
+        BidStates.XMR_SWAP_SCRIPT_TX_PREREFUND,
-        return True
+        BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_TX_SIGS,
-    if state == BidStates.XMR_SWAP_NOSCRIPT_TX_REDEEMED:
+        BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX,
-        return True
+        BidStates.XMR_SWAP_FAILED,
-    if state == BidStates.XMR_SWAP_SCRIPT_TX_REDEEMED:
+        BidStates.BID_REQUEST_ACCEPTED,
-        return True
+    )
-    if state == BidStates.XMR_SWAP_SCRIPT_TX_PREREFUND:
+
-        return True
+
-    if state == BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_TX_SIGS:
+def isErrorBidState(state):
-        return True
+    return state in (
-    if state == BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX:
+        BidStates.BID_STALLED_FOR_TEST,
-        return True
+        BidStates.BID_ERROR,
-    return False
+    )
+
+
+def isFailingBidState(state):
+    return state in (
+        BidStates.BID_STALLED_FOR_TEST,
+        BidStates.BID_ERROR,
+        BidStates.XMR_SWAP_SCRIPT_TX_PREREFUND,
+        BidStates.XMR_SWAP_NOSCRIPT_TX_RECOVERED,
+        BidStates.XMR_SWAP_FAILED_REFUNDED,
+        BidStates.XMR_SWAP_FAILED_SWIPED,
+        BidStates.XMR_SWAP_FAILED,
+    )
+
+
+def isFinalBidState(state):
+    return state in inactive_states

basicswap/chainparams.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2022 tecnovert
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -30,6 +30,9 @@ class Coins(IntEnum):
     # NDAU = 10
     PIVX = 11
     DASH = 12
+    FIRO = 13
+    NAV = 14
+    LTC_MWEB = 15
 
 
 chainparams = {
@@ -217,8 +220,10 @@ chainparams = {
         'message_magic': 'DarkNet Signed Message:\n',
         'blocks_target': 60 * 1,
         'decimal_places': 8,
+        'has_cltv': True,
         'has_csv': False,
         'has_segwit': False,
+        'use_ticker_as_name': True,
         'mainnet': {
             'rpcport': 51473,
             'pubkey_address': 30,
@@ -286,6 +291,85 @@ chainparams = {
             'min_amount': 1000,
             'max_amount': 100000 * COIN,
         }
+    },
+    Coins.FIRO: {
+        'name': 'firo',
+        'ticker': 'FIRO',
+        'message_magic': 'Zcoin Signed Message:\n',
+        'blocks_target': 60 * 10,
+        'decimal_places': 8,
+        'has_cltv': False,
+        'has_csv': False,
+        'has_segwit': False,
+        'mainnet': {
+            'rpcport': 8888,
+            'pubkey_address': 82,
+            'script_address': 7,
+            'key_prefix': 210,
+            'hrp': '',
+            'bip44': 136,
+            'min_amount': 1000,
+            'max_amount': 100000 * COIN,
+        },
+        'testnet': {
+            'rpcport': 18888,
+            'pubkey_address': 65,
+            'script_address': 178,
+            'key_prefix': 185,
+            'hrp': '',
+            'bip44': 1,
+            'min_amount': 1000,
+            'max_amount': 100000 * COIN,
+        },
+        'regtest': {
+            'rpcport': 28888,
+            'pubkey_address': 65,
+            'script_address': 178,
+            'key_prefix': 239,
+            'hrp': '',
+            'bip44': 1,
+            'min_amount': 1000,
+            'max_amount': 100000 * COIN,
+        }
+    },
+    Coins.NAV: {
+        'name': 'navcoin',
+        'ticker': 'NAV',
+        'message_magic': 'Navcoin Signed Message:\n',
+        'blocks_target': 30,
+        'decimal_places': 8,
+        'has_csv': True,
+        'has_segwit': True,
+        'mainnet': {
+            'rpcport': 44444,
+            'pubkey_address': 53,
+            'script_address': 85,
+            'key_prefix': 150,
+            'hrp': '',
+            'bip44': 130,
+            'min_amount': 1000,
+            'max_amount': 100000 * COIN,
+        },
+        'testnet': {
+            'rpcport': 44445,
+            'pubkey_address': 111,
+            'script_address': 196,
+            'key_prefix': 239,
+            'hrp': '',
+            'bip44': 1,
+            'min_amount': 1000,
+            'max_amount': 100000 * COIN,
+        },
+        'regtest': {
+            'rpcport': 44446,
+            'pubkey_address': 111,
+            'script_address': 196,
+            'key_prefix': 239,
+            'hrp': '',
+            'bip44': 1,
+            'min_amount': 1000,
+            'max_amount': 100000 * COIN,
+        }
     }
 }
 ticker_map = {}
@@ -312,17 +396,20 @@ class CoinInterface:
         self._unknown_wallet_seed = True
         self._restore_height = None
 
-    def make_int(self, amount_in, r=0):
+    def make_int(self, amount_in: int, r: int = 0) -> int:
         return make_int(amount_in, self.exp(), r=r)
 
     def format_amount(self, amount_in, conv_int=False, r=0):
         amount_int = make_int(amount_in, self.exp(), r=r) if conv_int else amount_in
         return format_amount(amount_int, self.exp())
 
-    def coin_name(self):
+    def coin_name(self) -> str:
-        return chainparams[self.coin_type()]['name'].capitalize()
+        coin_chainparams = chainparams[self.coin_type()]
+        if coin_chainparams.get('use_ticker_as_name', False):
+            return coin_chainparams['ticker']
+        return coin_chainparams['name'].capitalize()
 
-    def ticker(self):
+    def ticker(self) -> str:
         ticker = chainparams[self.coin_type()]['ticker']
         if self._network == 'testnet':
             ticker = 't' + ticker
@@ -330,23 +417,29 @@ class CoinInterface:
             ticker = 'rt' + ticker
         return ticker
 
-    def ticker_mainnet(self):
+    def getExchangeTicker(self, exchange_name: str) -> str:
+        return chainparams[self.coin_type()]['ticker']
+
+    def getExchangeName(self, exchange_name: str) -> str:
+        return chainparams[self.coin_type()]['name']
+
+    def ticker_mainnet(self) -> str:
         ticker = chainparams[self.coin_type()]['ticker']
         return ticker
 
-    def min_amount(self):
+    def min_amount(self) -> int:
         return chainparams[self.coin_type()][self._network]['min_amount']
 
-    def max_amount(self):
+    def max_amount(self) -> int:
         return chainparams[self.coin_type()][self._network]['max_amount']
 
-    def setWalletSeedWarning(self, value):
+    def setWalletSeedWarning(self, value: bool) -> None:
         self._unknown_wallet_seed = value
 
-    def setWalletRestoreHeight(self, value):
+    def setWalletRestoreHeight(self, value: int) -> None:
         self._restore_height = value
 
-    def knownWalletSeed(self):
+    def knownWalletSeed(self) -> bool:
         return not self._unknown_wallet_seed
 
     def chainparams(self):
@@ -355,16 +448,25 @@ class CoinInterface:
     def chainparams_network(self):
         return chainparams[self.coin_type()][self._network]
 
-    def is_transient_error(self, ex):
+    def has_segwit(self) -> bool:
+        return chainparams[self.coin_type()].get('has_segwit', True)
+
+    def is_transient_error(self, ex) -> bool:
         if isinstance(ex, TemporaryError):
             return True
-        str_error = str(ex).lower()
+        str_error: str = str(ex).lower()
         if 'not enough unlocked money' in str_error:
             return True
+        if 'no unlocked balance' in str_error:
+            return True
         if 'transaction was rejected by daemon' in str_error:
             return True
         if 'invalid unlocked_balance' in str_error:
             return True
         if 'daemon is busy' in str_error:
             return True
+        if 'timed out' in str_error:
+            return True
+        if 'request-sent' in str_error:
+            return True
         return False

basicswap/config.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2022 tecnovert
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -10,7 +10,7 @@ CONFIG_FILENAME = 'basicswap.json'
 BASICSWAP_DATADIR = os.getenv('BASICSWAP_DATADIR', '~/.basicswap')
 DEFAULT_ALLOW_CORS = False
 TEST_DATADIRS = os.path.expanduser(os.getenv('DATADIRS', '/tmp/basicswap'))
-DEFAULT_TEST_BINDIR = os.path.expanduser(os.getenv('DEFAULT_TEST_BINDIR', '~/tmp/bin'))
+DEFAULT_TEST_BINDIR = os.path.expanduser(os.getenv('DEFAULT_TEST_BINDIR', '~/.basicswap/bin'))
 
 bin_suffix = ('.exe' if os.name == 'nt' else '')
 PARTICL_BINDIR = os.path.expanduser(os.getenv('PARTICL_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'particl')))
@@ -36,13 +36,3 @@ NAMECOIN_TX = os.getenv('NAMECOIN_TX', 'namecoin-tx' + bin_suffix)
 XMR_BINDIR = os.path.expanduser(os.getenv('XMR_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'monero')))
 XMRD = os.getenv('XMRD', 'monerod' + bin_suffix)
 XMR_WALLET_RPC = os.getenv('XMR_WALLET_RPC', 'monero-wallet-rpc' + bin_suffix)
-
-PIVX_BINDIR = os.path.expanduser(os.getenv('PIVX_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'pivx')))
-PIVXD = os.getenv('PIVXD', 'pivxd' + bin_suffix)
-PIVX_CLI = os.getenv('PIVX_CLI', 'pivx-cli' + bin_suffix)
-PIVX_TX = os.getenv('PIVX_TX', 'pivx-tx' + bin_suffix)
-
-DASH_BINDIR = os.path.expanduser(os.getenv('DASH_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'dash')))
-DASHD = os.getenv('DASHD', 'dashd' + bin_suffix)
-DASH_CLI = os.getenv('DASH_CLI', 'dash-cli' + bin_suffix)
-DASH_TX = os.getenv('DASH_TX', 'dash-tx' + bin_suffix)

basicswap/db.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2022 tecnovert
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -12,8 +12,8 @@ from enum import IntEnum, auto
 from sqlalchemy.ext.declarative import declarative_base
 
 
-CURRENT_DB_VERSION = 16
+CURRENT_DB_VERSION = 22
-CURRENT_DB_DATA_VERSION = 2
+CURRENT_DB_DATA_VERSION = 4
 Base = declarative_base()
 
 
@@ -67,6 +67,7 @@ class Offer(Base):
 
     proof_address = sa.Column(sa.String)
     proof_signature = sa.Column(sa.LargeBinary)
+    proof_utxos = sa.Column(sa.LargeBinary)
     pkhash_seller = sa.Column(sa.LargeBinary)
     secret_hash = sa.Column(sa.LargeBinary)
 
@@ -74,7 +75,7 @@ class Offer(Base):
     addr_to = sa.Column(sa.String)
     created_at = sa.Column(sa.BigInteger)
     expire_at = sa.Column(sa.BigInteger)
-    was_sent = sa.Column(sa.Boolean)
+    was_sent = sa.Column(sa.Boolean)  # Sent by node
 
     from_feerate = sa.Column(sa.BigInteger)
     to_feerate = sa.Column(sa.BigInteger)
@@ -86,6 +87,7 @@ class Offer(Base):
     auto_accept_bids = sa.Column(sa.Boolean)
     withdraw_to_addr = sa.Column(sa.String)  # Address to spend lock tx to - address from wallet if empty TODO
     security_token = sa.Column(sa.LargeBinary)
+    bid_reversed = sa.Column(sa.Boolean)
 
     state = sa.Column(sa.Integer)
     states = sa.Column(sa.LargeBinary)  # Packed states and times
@@ -107,13 +109,14 @@ class Bid(Base):
     active_ind = sa.Column(sa.Integer)
 
     protocol_version = sa.Column(sa.Integer)
-    was_sent = sa.Column(sa.Boolean)
+    was_sent = sa.Column(sa.Boolean)  # Sent by node
     was_received = sa.Column(sa.Boolean)
     contract_count = sa.Column(sa.Integer)
     created_at = sa.Column(sa.BigInteger)
     expire_at = sa.Column(sa.BigInteger)
     bid_addr = sa.Column(sa.String)
     proof_address = sa.Column(sa.String)
+    proof_utxos = sa.Column(sa.LargeBinary)
     withdraw_to_addr = sa.Column(sa.String)  # Address to spend lock tx to - address from wallet if empty TODO
 
     recovered_secret = sa.Column(sa.LargeBinary)
@@ -123,7 +126,6 @@ class Bid(Base):
     amount = sa.Column(sa.BigInteger)
     rate = sa.Column(sa.BigInteger)
 
-    accept_msg_id = sa.Column(sa.LargeBinary)
     pkhash_seller = sa.Column(sa.LargeBinary)
 
     initiate_txn_redeem = sa.Column(sa.LargeBinary)
@@ -217,10 +219,25 @@ class SwapTx(Base):
     states = sa.Column(sa.LargeBinary)  # Packed states and times
 
     def setState(self, new_state):
+        if self.state == new_state:
+            return
         self.state = new_state
         self.states = (self.states if self.states is not None else bytes()) + struct.pack('<iq', new_state, int(time.time()))
 
 
+class PrefundedTx(Base):
+    __tablename__ = 'prefunded_transactions'
+
+    record_id = sa.Column(sa.Integer, primary_key=True, autoincrement=True)
+    active_ind = sa.Column(sa.Integer)
+    created_at = sa.Column(sa.BigInteger)
+    linked_type = sa.Column(sa.Integer)
+    linked_id = sa.Column(sa.LargeBinary)
+    tx_type = sa.Column(sa.Integer)  # TxTypes
+    tx_data = sa.Column(sa.LargeBinary)
+    used_by = sa.Column(sa.LargeBinary)
+
+
 class PooledAddress(Base):
     __tablename__ = 'addresspool'
 
@@ -277,12 +294,13 @@ class EventLog(Base):
 
 class XmrOffer(Base):
     __tablename__ = 'xmr_offers'
+    # TODO: Merge to Offer
 
     swap_id = sa.Column(sa.Integer, primary_key=True, autoincrement=True)
     offer_id = sa.Column(sa.LargeBinary, sa.ForeignKey('offers.offer_id'))
 
-    a_fee_rate = sa.Column(sa.BigInteger)
+    a_fee_rate = sa.Column(sa.BigInteger)  # Chain a fee rate
-    b_fee_rate = sa.Column(sa.BigInteger)
+    b_fee_rate = sa.Column(sa.BigInteger)  # Chain b fee rate
 
     lock_time_1 = sa.Column(sa.Integer)  # Delay before the chain a lock refund tx can be mined
     lock_time_2 = sa.Column(sa.Integer)  # Delay before the follower can spend from the chain a lock refund tx
@@ -293,16 +311,6 @@ class XmrSwap(Base):
 
     swap_id = sa.Column(sa.Integer, primary_key=True, autoincrement=True)
     bid_id = sa.Column(sa.LargeBinary, sa.ForeignKey('bids.bid_id'))
-    bid_msg_id2 = sa.Column(sa.LargeBinary)
-    bid_msg_id3 = sa.Column(sa.LargeBinary)
-
-    bid_accept_msg_id = sa.Column(sa.LargeBinary)
-    bid_accept_msg_id2 = sa.Column(sa.LargeBinary)
-    bid_accept_msg_id3 = sa.Column(sa.LargeBinary)
-
-    coin_a_lock_tx_sigs_l_msg_id = sa.Column(sa.LargeBinary)  # MSG3L F -> L
-    coin_a_lock_spend_tx_msg_id = sa.Column(sa.LargeBinary)  # MSG4F L -> F
-    coin_a_lock_release_msg_id = sa.Column(sa.LargeBinary)  # MSG5F L -> F
 
     contract_count = sa.Column(sa.Integer)
 
@@ -363,6 +371,8 @@ class XmrSplitData(Base):
     __tablename__ = 'xmr_split_data'
 
     record_id = sa.Column(sa.Integer, primary_key=True, autoincrement=True)
+    addr_from = sa.Column(sa.String)
+    addr_to = sa.Column(sa.String)
     bid_id = sa.Column(sa.LargeBinary)
     msg_type = sa.Column(sa.Integer)
     msg_sequence = sa.Column(sa.Integer)
@@ -408,6 +418,9 @@ class KnownIdentity(Base):
     num_recv_bids_rejected = sa.Column(sa.Integer)
     num_sent_bids_failed = sa.Column(sa.Integer)
     num_recv_bids_failed = sa.Column(sa.Integer)
+    automation_override = sa.Column(sa.Integer)  # AutomationOverrideOptions
+    visibility_override = sa.Column(sa.Integer)  # VisibilityOverrideOptions
+    data = sa.Column(sa.LargeBinary)
     note = sa.Column(sa.String)
     updated_at = sa.Column(sa.BigInteger)
     created_at = sa.Column(sa.BigInteger)
@@ -469,6 +482,9 @@ class BidState(Base):
     state_id = sa.Column(sa.Integer)
     label = sa.Column(sa.String)
     in_progress = sa.Column(sa.Integer)
+    in_error = sa.Column(sa.Integer)
+    swap_failed = sa.Column(sa.Integer)
+    swap_ended = sa.Column(sa.Integer)
 
     note = sa.Column(sa.String)
     created_at = sa.Column(sa.BigInteger)
@@ -482,3 +498,19 @@ class Notification(Base):
     created_at = sa.Column(sa.BigInteger)
     event_type = sa.Column(sa.Integer)
     event_data = sa.Column(sa.LargeBinary)
+
+
+class MessageLink(Base):
+    __tablename__ = 'message_links'
+
+    record_id = sa.Column(sa.Integer, primary_key=True, autoincrement=True)
+    active_ind = sa.Column(sa.Integer)
+    created_at = sa.Column(sa.BigInteger)
+
+    linked_type = sa.Column(sa.Integer)
+    linked_id = sa.Column(sa.LargeBinary)
+    # linked_row_id = sa.Column(sa.Integer)  # TODO: Find a way to use table rowids
+
+    msg_type = sa.Column(sa.Integer)
+    msg_sequence = sa.Column(sa.Integer)
+    msg_id = sa.Column(sa.LargeBinary)

basicswap/db_upgrades.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2022 tecnovert
+# Copyright (c) 2022-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -18,7 +18,11 @@ from .db import (
 from .basicswap_util import (
     BidStates,
     strBidState,
-    isActiveBidState)
+    isActiveBidState,
+    isErrorBidState,
+    isFailingBidState,
+    isFinalBidState,
+)
 
 
 def upgradeDatabaseData(self, data_version):
@@ -56,10 +60,13 @@ def upgradeDatabaseData(self, data_version):
                         active_ind=1,
                         state_id=int(state),
                         in_progress=isActiveBidState(state),
+                        in_error=isErrorBidState(state),
+                        swap_failed=isFailingBidState(state),
+                        swap_ended=isFinalBidState(state),
                         label=strBidState(state),
                         created_at=now))
 
-            if data_version < 2:
+            if data_version > 0 and data_version < 2:
                 for state in (BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_TX_SIGS, BidStates.XMR_SWAP_MSG_SCRIPT_LOCK_SPEND_TX):
                     session.add(BidState(
                         active_ind=1,
@@ -67,6 +74,23 @@ def upgradeDatabaseData(self, data_version):
                         in_progress=isActiveBidState(state),
                         label=strBidState(state),
                         created_at=now))
+            if data_version > 0 and data_version < 3:
+                for state in BidStates:
+                    in_error = isErrorBidState(state)
+                    swap_failed = isFailingBidState(state)
+                    swap_ended = isFinalBidState(state)
+                    session.execute('UPDATE bidstates SET in_error = :in_error, swap_failed = :swap_failed, swap_ended = :swap_ended WHERE state_id = :state_id', {'in_error': in_error, 'swap_failed': swap_failed, 'swap_ended': swap_ended, 'state_id': int(state)})
+            if data_version > 0 and data_version < 4:
+                for state in (BidStates.BID_REQUEST_SENT, BidStates.BID_REQUEST_ACCEPTED):
+                    session.add(BidState(
+                        active_ind=1,
+                        state_id=int(state),
+                        in_progress=isActiveBidState(state),
+                        in_error=isErrorBidState(state),
+                        swap_failed=isFailingBidState(state),
+                        swap_ended=isFinalBidState(state),
+                        label=strBidState(state),
+                        created_at=now))
 
             self.db_data_version = CURRENT_DB_DATA_VERSION
             self.setIntKVInSession('db_data_version', self.db_data_version, session)
@@ -225,6 +249,54 @@ def upgradeDatabase(self, db_version):
                     event_data BLOB,
                     created_at BIGINT,
                     PRIMARY KEY (record_id))''')
+        elif current_version == 16:
+            db_version += 1
+            session.execute('''
+                CREATE TABLE prefunded_transactions (
+                    record_id INTEGER NOT NULL,
+                    active_ind INTEGER,
+                    created_at BIGINT,
+                    linked_type INTEGER,
+                    linked_id BLOB,
+                    tx_type INTEGER,
+                    tx_data BLOB,
+                    used_by BLOB,
+                    PRIMARY KEY (record_id))''')
+        elif current_version == 17:
+            db_version += 1
+            session.execute('ALTER TABLE knownidentities ADD COLUMN automation_override INTEGER')
+            session.execute('ALTER TABLE knownidentities ADD COLUMN visibility_override INTEGER')
+            session.execute('ALTER TABLE knownidentities ADD COLUMN data BLOB')
+            session.execute('UPDATE knownidentities SET active_ind = 1')
+        elif current_version == 18:
+            db_version += 1
+            session.execute('ALTER TABLE xmr_split_data ADD COLUMN addr_from STRING')
+            session.execute('ALTER TABLE xmr_split_data ADD COLUMN addr_to STRING')
+        elif current_version == 19:
+            db_version += 1
+            session.execute('ALTER TABLE bidstates ADD COLUMN in_error INTEGER')
+            session.execute('ALTER TABLE bidstates ADD COLUMN swap_failed INTEGER')
+            session.execute('ALTER TABLE bidstates ADD COLUMN swap_ended INTEGER')
+        elif current_version == 20:
+            db_version += 1
+            session.execute('''
+                CREATE TABLE message_links (
+                    record_id INTEGER NOT NULL,
+                    active_ind INTEGER,
+                    created_at BIGINT,
+
+                    linked_type INTEGER,
+                    linked_id BLOB,
+
+                    msg_type INTEGER,
+                    msg_sequence INTEGER,
+                    msg_id BLOB,
+                    PRIMARY KEY (record_id))''')
+            session.execute('ALTER TABLE offers ADD COLUMN bid_reversed INTEGER')
+        elif current_version == 21:
+            db_version += 1
+            session.execute('ALTER TABLE offers ADD COLUMN proof_utxos BLOB')
+            session.execute('ALTER TABLE bids ADD COLUMN proof_utxos BLOB')
 
         if current_version != db_version:
             self.db_version = db_version

basicswap/db_util.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2023 The BSX Developers
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+from .db import (
+    Concepts,
+)
+
+
+def remove_expired_data(self, time_offset: int = 0):
+    now: int = self.getTime()
+    try:
+        session = self.openSession()
+
+        active_bids_insert = self.activeBidsQueryStr(now, '', 'b2')
+        query_str = f'''
+                    SELECT o.offer_id FROM offers o
+                    WHERE o.expire_at <= :expired_at AND 0 = (SELECT COUNT(*) FROM bids b2 WHERE b2.offer_id = o.offer_id AND {active_bids_insert})
+                    '''
+        num_offers = 0
+        num_bids = 0
+        offer_rows = session.execute(query_str, {'expired_at': now - time_offset})
+        for offer_row in offer_rows:
+            num_offers += 1
+            bid_rows = session.execute('SELECT bids.bid_id FROM bids WHERE bids.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            for bid_row in bid_rows:
+                num_bids += 1
+                session.execute('DELETE FROM transactions WHERE transactions.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM eventlog WHERE eventlog.linked_type = :type_ind AND eventlog.linked_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM automationlinks WHERE automationlinks.linked_type = :type_ind AND automationlinks.linked_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM prefunded_transactions WHERE prefunded_transactions.linked_type = :type_ind AND prefunded_transactions.linked_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM history WHERE history.concept_type = :type_ind AND history.concept_id = :bid_id', {'type_ind': int(Concepts.BID), 'bid_id': bid_row[0]})
+                session.execute('DELETE FROM xmr_swaps WHERE xmr_swaps.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM actions WHERE actions.linked_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM addresspool WHERE addresspool.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM xmr_split_data WHERE xmr_split_data.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM bids WHERE bids.bid_id = :bid_id', {'bid_id': bid_row[0]})
+                session.execute('DELETE FROM message_links WHERE linked_type = :type_ind AND linked_id = :linked_id', {'type_ind': int(Concepts.BID), 'linked_id': bid_row[0]})
+
+            session.execute('DELETE FROM eventlog WHERE eventlog.linked_type = :type_ind AND eventlog.linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM automationlinks WHERE automationlinks.linked_type = :type_ind AND automationlinks.linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM prefunded_transactions WHERE prefunded_transactions.linked_type = :type_ind AND prefunded_transactions.linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM history WHERE history.concept_type = :type_ind AND history.concept_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+            session.execute('DELETE FROM xmr_offers WHERE xmr_offers.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM sentoffers WHERE sentoffers.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM actions WHERE actions.linked_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM offers WHERE offers.offer_id = :offer_id', {'offer_id': offer_row[0]})
+            session.execute('DELETE FROM message_links WHERE linked_type = :type_ind AND linked_id = :offer_id', {'type_ind': int(Concepts.OFFER), 'offer_id': offer_row[0]})
+
+        if num_offers > 0 or num_bids > 0:
+            self.log.info('Removed data for {} expired offer{} and {} bid{}.'.format(num_offers, 's' if num_offers != 1 else '', num_bids, 's' if num_bids != 1 else ''))
+
+    finally:
+        self.closeSession(session)

basicswap/explorers.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2022 tecnovert
+# Copyright (c) 2019-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
 import json
-import urllib.request
 
 
 class Explorer():
@@ -17,12 +16,7 @@ class Explorer():
 
     def readURL(self, url):
         self.log.debug('Explorer url: {}'.format(url))
-        try:
+        return self.swapclient.readURL(url)
-            self.swapclient.setConnectionParameters()
-            req = urllib.request.Request(url)
-            return urllib.request.urlopen(req).read()
-        finally:
-            self.swapclient.popConnectionParameters()
 
 
 class ExplorerInsight(Explorer):

basicswap/http_server.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2022 tecnovert
+# Copyright (c) 2019-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 json
+import shlex
 import traceback
 import threading
 import http.client
@@ -16,7 +17,8 @@ from jinja2 import Environment, PackageLoader
 from . import __version__
 from .util import (
     dumpj,
-    ensure,
+    toBool,
+    LockedCoinError,
     format_timestamp,
 )
 from .chainparams import (
@@ -24,9 +26,8 @@ from .chainparams import (
     chainparams,
 )
 from .basicswap_util import (
-    strBidState,
     strTxState,
-    strAddressType,
+    strBidState,
 )
 
 from .js_server import (
@@ -36,7 +37,7 @@ from .js_server import (
 from .ui.util import (
     getCoinName,
     get_data_entry,
-    have_data_entry,
+    get_data_entry_or,
     listAvailableCoins,
 )
 from .ui.page_automation import (
@@ -49,22 +50,16 @@ from .ui.page_bids import page_bids, page_bid
 from .ui.page_offers import page_offers, page_offer, page_newoffer
 from .ui.page_tor import page_tor, get_tor_established_state
 from .ui.page_wallet import page_wallets, page_wallet
-
+from .ui.page_settings import page_settings
+from .ui.page_encryption import page_changepassword, page_unlock, page_lock
+from .ui.page_identity import page_identity
+from .ui.page_smsgaddresses import page_smsgaddresses
+from .ui.page_debug import page_debug
 
 env = Environment(loader=PackageLoader('basicswap', 'templates'))
 env.filters['formatts'] = format_timestamp
 
 
-def validateTextInput(text, name, messages, max_length=None):
-    if max_length is not None and len(text) > max_length:
-        messages.append(f'Error: {name} is too long')
-        return False
-    if len(text) > 0 and all(c.isalnum() or c.isspace() for c in text) is False:
-        messages.append(f'Error: {name} must consist of only letters and digits')
-        return False
-    return True
-
-
 def extractDomain(url):
     return url.split('://', 1)[1].split('/', 1)[0]
 
@@ -75,7 +70,7 @@ def listAvailableExplorers(swap_client):
         if c not in chainparams:
             continue
         for i, e in enumerate(swap_client.coin_clients[c]['explorers']):
-            explorers.append(('{}_{}'.format(int(c), i), swap_client.coin_clients[c]['name'].capitalize() + ' - ' + extractDomain(e.base_url)))
+            explorers.append(('{}_{}'.format(int(c), i), getCoinName(c) + ' - ' + extractDomain(e.base_url)))
     return explorers
 
 
@@ -88,8 +83,40 @@ def listExplorerActions(swap_client):
     return actions
 
 
+def parse_cmd(cmd: str, type_map: str):
+    params = shlex.split(cmd)
+    if len(params) < 1:
+        return '', []
+    method = params[0]
+    typed_params = []
+    params = params[1:]
+
+    for i, param in enumerate(params):
+        if i >= len(type_map):
+            type_ind = 's'
+        else:
+            type_ind = type_map[i]
+        if type_ind == 'i':
+            typed_params.append(int(param))
+        elif type_ind == 'b':
+            typed_params.append(toBool(param))
+        elif type_ind == 'j':
+            typed_params.append(json.loads(param))
+        else:
+            typed_params.append(param)
+
+    return method, typed_params
+
+
 class HttpHandler(BaseHTTPRequestHandler):
 
+    def log_error(self, format, *args):
+        super().log_message(format, *args)
+
+    def log_message(self, format, *args):
+        # TODO: Add debug flag to re-enable.
+        pass
+
     def generate_form_id(self):
         return os.urandom(8).hex()
 
@@ -100,11 +127,11 @@ class HttpHandler(BaseHTTPRequestHandler):
         form_id = form_data[b'formid'][0].decode('utf-8')
         if self.server.last_form_id.get(name, None) == form_id:
             messages.append('Prevented double submit for form {}.'.format(form_id))
-        else:
+            return None
-            self.server.last_form_id[name] = form_id
+        self.server.last_form_id[name] = form_id
         return form_data
 
-    def render_template(self, template, args_dict):
+    def render_template(self, template, args_dict, status_code=200, version=__version__):
         swap_client = self.server.swap_client
         if swap_client.ws_server:
             args_dict['ws_url'] = swap_client.ws_server.url
@@ -124,24 +151,33 @@ class HttpHandler(BaseHTTPRequestHandler):
         if swap_client._show_notifications:
             args_dict['notifications'] = swap_client.getNotifications()
 
-        # TODO: Remove _withids
         if 'messages' in args_dict:
             messages_with_ids = []
             for msg in args_dict['messages']:
                 messages_with_ids.append((self.server.msg_id_counter, msg))
                 self.server.msg_id_counter += 1
-            args_dict['messages_withids'] = messages_with_ids
+            args_dict['messages'] = messages_with_ids
         if 'err_messages' in args_dict:
             err_messages_with_ids = []
             for msg in args_dict['err_messages']:
                 err_messages_with_ids.append((self.server.msg_id_counter, msg))
                 self.server.msg_id_counter += 1
-            args_dict['err_messages_withids'] = err_messages_with_ids
+            args_dict['err_messages'] = err_messages_with_ids
+
+        shutdown_token = os.urandom(8).hex()
+        self.server.session_tokens['shutdown'] = shutdown_token
+        args_dict['shutdown_token'] = shutdown_token
+
+        encrypted, locked = swap_client.getLockedState()
+        args_dict['encrypted'] = encrypted
+        args_dict['locked'] = locked
 
         if self.server.msg_id_counter >= 0x7FFFFFFF:
             self.server.msg_id_counter = 0
 
-        self.putHeaders(200, 'text/html')
+        args_dict['version'] = version
+
+        self.putHeaders(status_code, 'text/html')
         return bytes(template.render(
             title=self.server.title,
             h2=self.server.title,
@@ -178,13 +214,15 @@ class HttpHandler(BaseHTTPRequestHandler):
 
     def page_explorers(self, url_split, post_string):
         swap_client = self.server.swap_client
+        swap_client.checkSystemStatus()
         summary = swap_client.getSummary()
 
         result = None
         explorer = -1
         action = -1
         messages = []
-        form_data = self.checkForm(post_string, 'explorers', messages)
+        err_messages = []
+        form_data = self.checkForm(post_string, 'explorers', err_messages)
         if form_data:
 
             explorer = form_data[b'explorer'][0].decode('utf-8')
@@ -211,6 +249,8 @@ class HttpHandler(BaseHTTPRequestHandler):
 
         template = env.get_template('explorers.html')
         return self.render_template(template, {
+            'messages': messages,
+            'err_messages': err_messages,
             'explorers': listAvailableExplorers(swap_client),
             'explorer': explorer,
             'actions': listExplorerActions(swap_client),
@@ -221,44 +261,64 @@ class HttpHandler(BaseHTTPRequestHandler):
 
     def page_rpc(self, url_split, post_string):
         swap_client = self.server.swap_client
+        swap_client.checkSystemStatus()
         summary = swap_client.getSummary()
 
         result = None
         coin_type = -1
         coin_id = -1
+        call_type = 'cli'
+        type_map = ''
         messages = []
-        form_data = self.checkForm(post_string, 'rpc', messages)
+        err_messages = []
+        form_data = self.checkForm(post_string, 'rpc', err_messages)
         if form_data:
             try:
-                coin_id = int(form_data[b'coin_type'][0])
+                call_type = get_data_entry_or(form_data, 'call_type', 'cli')
-                if coin_id in (-2, -3, -4):
+                type_map = get_data_entry_or(form_data, 'type_map', '')
-                    coin_type = Coins(Coins.XMR)
+                try:
-                else:
+                    coin_id = int(get_data_entry(form_data, 'coin_type'))
-                    coin_type = Coins(coin_id)
+                    if coin_id in (-2, -3, -4):
-            except Exception:
+                        coin_type = Coins(Coins.XMR)
-                raise ValueError('Unknown Coin Type')
+                    elif coin_id in (-5,):
+                        coin_type = Coins(Coins.LTC)
+                    else:
+                        coin_type = Coins(coin_id)
+                except Exception:
+                    raise ValueError('Unknown Coin Type')
 
-            cmd = form_data[b'cmd'][0].decode('utf-8')
+                try:
-
+                    cmd = get_data_entry(form_data, 'cmd')
-            try:
+                except Exception:
+                    raise ValueError('Invalid command')
                 if coin_type == Coins.XMR:
                     ci = swap_client.ci(coin_type)
                     arr = cmd.split(None, 1)
                     method = arr[0]
                     params = json.loads(arr[1]) if len(arr) > 1 else []
                     if coin_id == -4:
-                        rv = ci.rpc_wallet_cb(method, params)
+                        rv = ci.rpc_wallet(method, params)
                     elif coin_id == -3:
-                        rv = ci.rpc_cb(method, params)
+                        rv = ci.rpc(method, params)
                     elif coin_id == -2:
                         if params == []:
                             params = None
-                        rv = ci.rpc_cb2(method, params)
+                        rv = ci.rpc2(method, params)
                     else:
                         raise ValueError('Unknown XMR RPC variant')
                     result = json.dumps(rv, indent=4)
                 else:
-                    result = cmd + '\n' + swap_client.callcoincli(coin_type, cmd)
+                    if call_type == 'http':
+                        method, params = parse_cmd(cmd, type_map)
+                        if coin_id == -5:
+                            rv = swap_client.ci(coin_type).rpc_wallet_mweb(method, params)
+                        else:
+                            rv = swap_client.ci(coin_type).rpc_wallet(method, params)
+                        if not isinstance(rv, str):
+                            rv = json.dumps(rv, indent=4)
+                        result = cmd + '\n' + rv
+                    else:
+                        result = cmd + '\n' + swap_client.callcoincli(coin_type, cmd)
             except Exception as ex:
                 result = str(ex)
                 if self.server.swap_client.debug is True:
@@ -267,43 +327,30 @@ class HttpHandler(BaseHTTPRequestHandler):
         template = env.get_template('rpc.html')
 
         coins = listAvailableCoins(swap_client, with_variants=False)
+        with_xmr: bool = any(c[0] == Coins.XMR for c in coins)
         coins = [c for c in coins if c[0] != Coins.XMR]
-        coins.append((-2, 'Monero'))
+
-        coins.append((-3, 'Monero JSON'))
+        if any(c[0] == Coins.LTC for c in coins):
-        coins.append((-4, 'Monero Wallet'))
+            coins.append((-5, 'Litecoin MWEB Wallet'))
+        if with_xmr:
+            coins.append((-2, 'Monero'))
+            coins.append((-3, 'Monero JSON'))
+            coins.append((-4, 'Monero Wallet'))
 
         return self.render_template(template, {
+            'messages': messages,
+            'err_messages': err_messages,
             'coins': coins,
             'coin_type': coin_id,
+            'call_type': call_type,
             'result': result,
             'messages': messages,
             'summary': summary,
         })
 
-    def page_debug(self, url_split, post_string):
-        swap_client = self.server.swap_client
-        summary = swap_client.getSummary()
-
-        result = None
-        messages = []
-        form_data = self.checkForm(post_string, 'wallets', messages)
-        if form_data:
-            if have_data_entry(form_data, 'reinit_xmr'):
-                try:
-                    swap_client.initialiseWallet(Coins.XMR)
-                    messages.append('Done.')
-                except Exception as a:
-                    messages.append('Failed.')
-
-        template = env.get_template('debug.html')
-        return self.render_template(template, {
-            'messages': messages,
-            'result': result,
-            'summary': summary,
-        })
-
     def page_active(self, url_split, post_string):
         swap_client = self.server.swap_client
+        swap_client.checkSystemStatus()
         active_swaps = swap_client.listSwapsInProgress()
         summary = swap_client.getSummary()
 
@@ -314,80 +361,9 @@ class HttpHandler(BaseHTTPRequestHandler):
             'summary': summary,
         })
 
-    def page_settings(self, url_split, post_string):
-        swap_client = self.server.swap_client
-        summary = swap_client.getSummary()
-
-        messages = []
-        form_data = self.checkForm(post_string, 'settings', messages)
-        if form_data:
-            for name, c in swap_client.settings['chainclients'].items():
-                if have_data_entry(form_data, 'apply_' + name):
-                    data = {'lookups': get_data_entry(form_data, 'lookups_' + name)}
-                    if name == 'monero':
-                        data['fee_priority'] = int(get_data_entry(form_data, 'fee_priority_' + name))
-                        data['manage_daemon'] = True if get_data_entry(form_data, 'managedaemon_' + name) == 'true' else False
-                        data['rpchost'] = get_data_entry(form_data, 'rpchost_' + name)
-                        data['rpcport'] = int(get_data_entry(form_data, 'rpcport_' + name))
-                        data['remotedaemonurls'] = get_data_entry(form_data, 'remotedaemonurls_' + name)
-                        data['automatically_select_daemon'] = True if get_data_entry(form_data, 'autosetdaemon_' + name) == 'true' else False
-                    else:
-                        data['conf_target'] = int(get_data_entry(form_data, 'conf_target_' + name))
-                        if name == 'particl':
-                            data['anon_tx_ring_size'] = int(get_data_entry(form_data, 'rct_ring_size_' + name))
-
-                    settings_changed, suggest_reboot = swap_client.editSettings(name, data)
-                    if settings_changed is True:
-                        messages.append('Settings applied.')
-                    if suggest_reboot is True:
-                        messages.append('Please restart BasicSwap.')
-                elif have_data_entry(form_data, 'enable_' + name):
-                    swap_client.enableCoin(name)
-                    messages.append(name.capitalize() + ' enabled, shutting down.')
-                    swap_client.stopRunning()
-                elif have_data_entry(form_data, 'disable_' + name):
-                    swap_client.disableCoin(name)
-                    messages.append(name.capitalize() + ' disabled, shutting down.')
-                    swap_client.stopRunning()
-        chains_formatted = []
-
-        sorted_names = sorted(swap_client.settings['chainclients'].keys())
-        for name in sorted_names:
-            c = swap_client.settings['chainclients'][name]
-            chains_formatted.append({
-                'name': name,
-                'lookups': c.get('chain_lookups', 'local'),
-                'manage_daemon': c.get('manage_daemon', 'Unknown'),
-                'connection_type': c.get('connection_type', 'Unknown'),
-            })
-            if name == 'monero':
-                chains_formatted[-1]['fee_priority'] = c.get('fee_priority', 0)
-                chains_formatted[-1]['manage_wallet_daemon'] = c.get('manage_wallet_daemon', 'Unknown')
-                chains_formatted[-1]['rpchost'] = c.get('rpchost', 'localhost')
-                chains_formatted[-1]['rpcport'] = int(c.get('rpcport', 18081))
-                chains_formatted[-1]['remotedaemonurls'] = '\n'.join(c.get('remote_daemon_urls', []))
-                chains_formatted[-1]['autosetdaemon'] = c.get('automatically_select_daemon', False)
-            else:
-                chains_formatted[-1]['conf_target'] = c.get('conf_target', 2)
-
-            if name == 'particl':
-                chains_formatted[-1]['anon_tx_ring_size'] = c.get('anon_tx_ring_size', 12)
-            else:
-                if c.get('connection_type', 'Unknown') == 'none':
-                    if 'connection_type_prev' in c:
-                        chains_formatted[-1]['can_reenable'] = True
-                else:
-                    chains_formatted[-1]['can_disable'] = True
-
-        template = env.get_template('settings.html')
-        return self.render_template(template, {
-            'messages': messages,
-            'chains': chains_formatted,
-            'summary': summary,
-        })
-
     def page_watched(self, url_split, post_string):
         swap_client = self.server.swap_client
+        swap_client.checkSystemStatus()
         watched_outputs, last_scanned = swap_client.listWatchedOutputs()
         summary = swap_client.getSummary()
 
@@ -399,121 +375,6 @@ class HttpHandler(BaseHTTPRequestHandler):
             'summary': summary,
         })
 
-    def page_smsgaddresses(self, url_split, post_string):
-        swap_client = self.server.swap_client
-        summary = swap_client.getSummary()
-
-        page_data = {}
-        messages = []
-        smsgaddresses = []
-
-        listaddresses = True
-        form_data = self.checkForm(post_string, 'smsgaddresses', messages)
-        if form_data:
-            edit_address_id = None
-            for key in form_data:
-                if key.startswith(b'editaddr_'):
-                    edit_address_id = int(key.split(b'_')[1])
-                    break
-            if edit_address_id is not None:
-                listaddresses = False
-                page_data['edit_address'] = edit_address_id
-                page_data['addr_data'] = swap_client.listAllSMSGAddresses(addr_id=edit_address_id)[0]
-            elif b'saveaddr' in form_data:
-                edit_address_id = int(form_data[b'edit_address_id'][0].decode('utf-8'))
-                edit_addr = form_data[b'edit_address'][0].decode('utf-8')
-                active_ind = int(form_data[b'active_ind'][0].decode('utf-8'))
-                ensure(active_ind in (0, 1), 'Invalid sort by')
-                addressnote = '' if b'addressnote' not in form_data else form_data[b'addressnote'][0].decode('utf-8')
-                if not validateTextInput(addressnote, 'Address note', messages, max_length=30):
-                    listaddresses = False
-                    page_data['edit_address'] = edit_address_id
-                else:
-                    swap_client.editSMSGAddress(edit_addr, active_ind=active_ind, addressnote=addressnote)
-                    messages.append(f'Edited address {edit_addr}')
-            elif b'shownewaddr' in form_data:
-                listaddresses = False
-                page_data['new_address'] = True
-            elif b'showaddaddr' in form_data:
-                listaddresses = False
-                page_data['new_send_address'] = True
-            elif b'createnewaddr' in form_data:
-                addressnote = '' if b'addressnote' not in form_data else form_data[b'addressnote'][0].decode('utf-8')
-                if not validateTextInput(addressnote, 'Address note', messages, max_length=30):
-                    listaddresses = False
-                    page_data['new_address'] = True
-                else:
-                    new_addr, pubkey = swap_client.newSMSGAddress(addressnote=addressnote)
-                    messages.append(f'Created address {new_addr}, pubkey {pubkey}')
-            elif b'createnewsendaddr' in form_data:
-                pubkey_hex = form_data[b'addresspubkey'][0].decode('utf-8')
-                addressnote = '' if b'addressnote' not in form_data else form_data[b'addressnote'][0].decode('utf-8')
-                if not validateTextInput(addressnote, 'Address note', messages, max_length=30) or \
-                   not validateTextInput(pubkey_hex, 'Pubkey', messages, max_length=66):
-                    listaddresses = False
-                    page_data['new_send_address'] = True
-                else:
-                    new_addr = swap_client.addSMSGAddress(pubkey_hex, addressnote=addressnote)
-                    messages.append(f'Added address {new_addr}')
-
-        if listaddresses is True:
-            smsgaddresses = swap_client.listAllSMSGAddresses()
-        network_addr = swap_client.network_addr
-
-        for addr in smsgaddresses:
-            addr['type'] = strAddressType(addr['type'])
-
-        template = env.get_template('smsgaddresses.html')
-        return self.render_template(template, {
-            'messages': messages,
-            'data': page_data,
-            'smsgaddresses': smsgaddresses,
-            'network_addr': network_addr,
-            'summary': summary,
-        })
-
-    def page_identity(self, url_split, post_string):
-        ensure(len(url_split) > 2, 'Address not specified')
-        identity_address = url_split[2]
-        swap_client = self.server.swap_client
-        summary = swap_client.getSummary()
-
-        page_data = {'identity_address': identity_address}
-        messages = []
-        form_data = self.checkForm(post_string, 'identity', messages)
-        if form_data:
-            if have_data_entry(form_data, 'edit'):
-                page_data['show_edit_form'] = True
-            if have_data_entry(form_data, 'apply'):
-                new_label = get_data_entry(form_data, 'label')
-
-                try:
-                    swap_client.updateIdentity(identity_address, new_label)
-                    messages.append('Updated')
-                except Exception as e:
-                    messages.append('Error')
-
-        try:
-            identity = swap_client.getIdentity(identity_address)
-            if identity is None:
-                raise ValueError('Unknown address')
-            page_data['label'] = identity.label
-            page_data['num_sent_bids_successful'] = identity.num_sent_bids_successful
-            page_data['num_recv_bids_successful'] = identity.num_recv_bids_successful
-            page_data['num_sent_bids_rejected'] = identity.num_sent_bids_rejected
-            page_data['num_recv_bids_rejected'] = identity.num_recv_bids_rejected
-            page_data['num_sent_bids_failed'] = identity.num_sent_bids_failed
-            page_data['num_recv_bids_failed'] = identity.num_recv_bids_failed
-        except Exception as e:
-            messages.append(e)
-
-        template = env.get_template('identity.html')
-        return self.render_template(template, {
-            'messages': messages,
-            'data': page_data,
-            'summary': summary,
-        })
-
     def page_shutdown(self, url_split, post_string):
         swap_client = self.server.swap_client
 
@@ -529,18 +390,13 @@ class HttpHandler(BaseHTTPRequestHandler):
 
     def page_index(self, url_split):
         swap_client = self.server.swap_client
+        swap_client.checkSystemStatus()
         summary = swap_client.getSummary()
-
-        shutdown_token = os.urandom(8).hex()
-        self.server.session_tokens['shutdown'] = shutdown_token
-
         template = env.get_template('index.html')
         return self.render_template(template, {
             'refresh': 30,
-            'version': __version__,
             'summary': summary,
-            'use_tor_proxy': swap_client.use_tor_proxy,
+            'use_tor_proxy': swap_client.use_tor_proxy
-            'shutdown_token': shutdown_token
         })
 
     def page_404(self, url_split):
@@ -559,6 +415,7 @@ class HttpHandler(BaseHTTPRequestHandler):
         self.end_headers()
 
     def handle_http(self, status_code, path, post_string='', is_json=False):
+        swap_client = self.server.swap_client
         parsed = parse.urlparse(self.path)
         url_split = parsed.path.split('/')
         if post_string == '' and len(parsed.query) > 0:
@@ -569,14 +426,13 @@ class HttpHandler(BaseHTTPRequestHandler):
                 func = js_url_to_function(url_split)
                 return func(self, url_split, post_string, is_json)
             except Exception as ex:
-                if self.server.swap_client.debug is True:
+                if swap_client.debug is True:
-                    self.server.swap_client.log.error(traceback.format_exc())
+                    swap_client.log.error(traceback.format_exc())
                 return js_error(self, str(ex))
 
         if len(url_split) > 1 and url_split[1] == 'static':
             try:
                 static_path = os.path.join(os.path.dirname(__file__), 'static')
-
                 if len(url_split) > 3 and url_split[2] == 'sequence_diagrams':
                     with open(os.path.join(static_path, 'sequence_diagrams', url_split[3]), 'rb') as fp:
                         self.putHeaders(status_code, 'image/svg+xml')
@@ -607,20 +463,18 @@ class HttpHandler(BaseHTTPRequestHandler):
                         self.putHeaders(status_code, 'application/javascript')
                         return fp.read()
                 else:
-                    self.putHeaders(status_code, 'text/html')
                     return self.page_404(url_split)
             except FileNotFoundError:
-                self.putHeaders(status_code, 'text/html')
                 return self.page_404(url_split)
             except Exception as ex:
-                if self.server.swap_client.debug is True:
+                if swap_client.debug is True:
-                    self.server.swap_client.log.error(traceback.format_exc())
+                    swap_client.log.error(traceback.format_exc())
-                self.putHeaders(status_code, 'text/html')
                 return self.page_error(str(ex))
 
         try:
             if len(url_split) > 1:
                 page = url_split[1]
+
                 if page == 'active':
                     return self.page_active(url_split, post_string)
                 if page == 'wallets':
@@ -628,7 +482,7 @@ class HttpHandler(BaseHTTPRequestHandler):
                 if page == 'wallet':
                     return page_wallet(self, url_split, post_string)
                 if page == 'settings':
-                    return self.page_settings(url_split, post_string)
+                    return page_settings(self, url_split, post_string)
                 if page == 'error':
                     return self.page_error(url_split, post_string)
                 if page == 'info':
@@ -636,7 +490,7 @@ class HttpHandler(BaseHTTPRequestHandler):
                 if page == 'rpc':
                     return self.page_rpc(url_split, post_string)
                 if page == 'debug':
-                    return self.page_debug(url_split, post_string)
+                    return page_debug(self, url_split, post_string)
                 if page == 'explorers':
                     return self.page_explorers(url_split, post_string)
                 if page == 'offer':
@@ -658,9 +512,9 @@ class HttpHandler(BaseHTTPRequestHandler):
                 if page == 'watched':
                     return self.page_watched(url_split, post_string)
                 if page == 'smsgaddresses':
-                    return self.page_smsgaddresses(url_split, post_string)
+                    return page_smsgaddresses(self, url_split, post_string)
                 if page == 'identity':
-                    return self.page_identity(url_split, post_string)
+                    return page_identity(self, url_split, post_string)
                 if page == 'tor':
                     return page_tor(self, url_split, post_string)
                 if page == 'automation':
@@ -671,12 +525,20 @@ class HttpHandler(BaseHTTPRequestHandler):
                     return page_automation_strategy_new(self, url_split, post_string)
                 if page == 'shutdown':
                     return self.page_shutdown(url_split, post_string)
+                if page == 'changepassword':
+                    return page_changepassword(self, url_split, post_string)
+                if page == 'unlock':
+                    return page_unlock(self, url_split, post_string)
+                if page == 'lock':
+                    return page_lock(self, url_split, post_string)
                 if page != '':
                     return self.page_404(url_split)
             return self.page_index(url_split)
+        except LockedCoinError:
+            return page_unlock(self, url_split, post_string)
         except Exception as ex:
-            if self.server.swap_client.debug is True:
+            if swap_client.debug is True:
-                self.server.swap_client.log.error(traceback.format_exc())
+                swap_client.log.error(traceback.format_exc())
             return self.page_error(str(ex))
 
     def do_GET(self):
@@ -731,11 +593,8 @@ class HttpThread(threading.Thread, HTTPServer):
         data = response.read()
         conn.close()
 
-    def stopped(self):
-        return self.stop_event.is_set()
-
     def serve_forever(self):
-        while not self.stopped():
+        while not self.stop_event.is_set():
             self.handle_request()
         self.socket.close()
 

basicswap/interface/__init__.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2023 tecnovert
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+from enum import IntEnum
+
+
+class Curves(IntEnum):
+    secp256k1 = 1
+    ed25519 = 2

basicswap/interface/contrib/firo_test_framework/authproxy.py

@@ -0,0 +1,191 @@
+
+"""
+  Copyright (c) 2011 Jeff Garzik
+
+  AuthServiceProxy has the following improvements over python-jsonrpc's
+  ServiceProxy class:
+
+  - HTTP connections persist for the life of the AuthServiceProxy object
+    (if server supports HTTP/1.1)
+  - sends protocol 'version', per JSON-RPC 1.1
+  - sends proper, incrementing 'id'
+  - sends Basic HTTP authentication headers
+  - parses all JSON numbers that look like floats as Decimal
+  - uses standard Python json lib
+
+  Previous copyright, from python-jsonrpc/jsonrpc/proxy.py:
+
+  Copyright (c) 2007 Jan-Klaas Kollhof
+
+  This file is part of jsonrpc.
+
+  jsonrpc is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this software; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+"""
+
+try:
+    import http.client as httplib
+except ImportError:
+    import httplib
+import base64
+import decimal
+import json
+import logging
+import socket
+try:
+    import urllib.parse as urlparse
+except ImportError:
+    import urlparse
+
+USER_AGENT = "AuthServiceProxy/0.1"
+
+HTTP_TIMEOUT = 30
+
+log = logging.getLogger("BitcoinRPC")
+
+class JSONRPCException(Exception):
+    def __init__(self, rpc_error):
+        try:
+            errmsg = '%(message)s (%(code)i)' % rpc_error
+        except (KeyError, TypeError):
+            errmsg = ''
+        Exception.__init__(self, errmsg)
+        self.error = rpc_error
+
+
+def EncodeDecimal(o):
+    if isinstance(o, decimal.Decimal):
+        return str(o)
+    raise TypeError(repr(o) + " is not JSON serializable")
+
+class AuthServiceProxy(object):
+    __id_count = 0
+
+    # ensure_ascii: escape unicode as \uXXXX, passed to json.dumps
+    def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connection=None, ensure_ascii=True):
+        self.__service_url = service_url
+        self._service_name = service_name
+        self.ensure_ascii = ensure_ascii # can be toggled on the fly by tests
+        self.__url = urlparse.urlparse(service_url)
+        if self.__url.port is None:
+            port = 80
+        else:
+            port = self.__url.port
+        (user, passwd) = (self.__url.username, self.__url.password)
+        try:
+            user = user.encode('utf8')
+        except AttributeError:
+            pass
+        try:
+            passwd = passwd.encode('utf8')
+        except AttributeError:
+            pass
+        authpair = user + b':' + passwd
+        self.__auth_header = b'Basic ' + base64.b64encode(authpair)
+
+        if connection:
+            # Callables re-use the connection of the original proxy
+            self.__conn = connection
+        elif self.__url.scheme == 'https':
+            self.__conn = httplib.HTTPSConnection(self.__url.hostname, port,
+                                                  timeout=timeout)
+        else:
+            self.__conn = httplib.HTTPConnection(self.__url.hostname, port,
+                                                 timeout=timeout)
+
+    def __getattr__(self, name):
+        if name.startswith('__') and name.endswith('__'):
+            # Python internal stuff
+            raise AttributeError
+        if self._service_name is not None:
+            name = "%s.%s" % (self._service_name, name)
+        return AuthServiceProxy(self.__service_url, name, connection=self.__conn)
+
+    def _request(self, method, path, postdata):
+        '''
+        Do a HTTP request, with retry if we get disconnected (e.g. due to a timeout).
+        This is a workaround for https://bugs.python.org/issue3566 which is fixed in Python 3.5.
+        '''
+        headers = {'Host': self.__url.hostname,
+                   'User-Agent': USER_AGENT,
+                   'Authorization': self.__auth_header,
+                   'Content-type': 'application/json'}
+        try:
+            self.__conn.request(method, path, postdata, headers)
+            return self._get_response()
+        except httplib.BadStatusLine as e:
+            if e.line == "''": # if connection was closed, try again
+                self.__conn.close()
+                self.__conn.request(method, path, postdata, headers)
+                return self._get_response()
+            else:
+                raise
+        except (BrokenPipeError,ConnectionResetError):
+            # Python 3.5+ raises BrokenPipeError instead of BadStatusLine when the connection was reset
+            # ConnectionResetError happens on FreeBSD with Python 3.4
+            self.__conn.close()
+            self.__conn.request(method, path, postdata, headers)
+            return self._get_response()
+
+    def __call__(self, *args, **argsn):
+        AuthServiceProxy.__id_count += 1
+
+        log.debug("-%s-> %s %s"%(AuthServiceProxy.__id_count, self._service_name,
+                                 json.dumps(args, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
+        if args and argsn:
+            raise ValueError('Cannot handle both named and positional arguments')
+        postdata = json.dumps({'version': '1.1',
+                               'method': self._service_name,
+                               'params': args or argsn,
+                               'id': AuthServiceProxy.__id_count}, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
+        response = self._request('POST', self.__url.path, postdata.encode('utf-8'))
+        if response['error'] is not None:
+            raise JSONRPCException(response['error'])
+        elif 'result' not in response:
+            raise JSONRPCException({
+                'code': -343, 'message': 'missing JSON-RPC result'})
+        else:
+            return response['result']
+
+    def _batch(self, rpc_call_list):
+        postdata = json.dumps(list(rpc_call_list), default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
+        log.debug("--> "+postdata)
+        return self._request('POST', self.__url.path, postdata.encode('utf-8'))
+
+    def _get_response(self):
+        try:
+            http_response = self.__conn.getresponse()
+        except socket.timeout as e:
+            raise JSONRPCException({
+                'code': -344,
+                'message': '%r RPC took longer than %f seconds. Consider '
+                           'using larger timeout for calls that take '
+                           'longer to return.' % (self._service_name,
+                                                  self.__conn.timeout)})
+        if http_response is None:
+            raise JSONRPCException({
+                'code': -342, 'message': 'missing HTTP response from server'})
+
+        content_type = http_response.getheader('Content-Type')
+        if content_type != 'application/json':
+            raise JSONRPCException({
+                'code': -342, 'message': 'non-JSON HTTP response with \'%i %s\' from server' % (http_response.status, http_response.reason)})
+
+        responsedata = http_response.read().decode('utf8')
+        response = json.loads(responsedata, parse_float=decimal.Decimal)
+        if "error" in response and response["error"] is None:
+            log.debug("<-%s- %s"%(response["id"], json.dumps(response["result"], default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
+        else:
+            log.debug("<-- "+responsedata)
+        return response

basicswap/interface/contrib/firo_test_framework/bignum.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+#
+# bignum.py
+#
+# This file is copied from python-bitcoinlib.
+#
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+
+"""Bignum routines"""
+
+
+import struct
+
+
+# generic big endian MPI format
+
+def bn_bytes(v, have_ext=False):
+    ext = 0
+    if have_ext:
+        ext = 1
+    return ((v.bit_length()+7)//8) + ext
+
+def bn2bin(v):
+    s = bytearray()
+    i = bn_bytes(v)
+    while i > 0:
+        s.append((v >> ((i-1) * 8)) & 0xff)
+        i -= 1
+    return s
+
+def bin2bn(s):
+    l = 0
+    for ch in s:
+        l = (l << 8) | ch
+    return l
+
+def bn2mpi(v):
+    have_ext = False
+    if v.bit_length() > 0:
+        have_ext = (v.bit_length() & 0x07) == 0
+
+    neg = False
+    if v < 0:
+        neg = True
+        v = -v
+
+    s = struct.pack(b">I", bn_bytes(v, have_ext))
+    ext = bytearray()
+    if have_ext:
+        ext.append(0)
+    v_bin = bn2bin(v)
+    if neg:
+        if have_ext:
+            ext[0] |= 0x80
+        else:
+            v_bin[0] |= 0x80
+    return s + ext + v_bin
+
+def mpi2bn(s):
+    if len(s) < 4:
+        return None
+    s_size = bytes(s[:4])
+    v_len = struct.unpack(b">I", s_size)[0]
+    if len(s) != (v_len + 4):
+        return None
+    if v_len == 0:
+        return 0
+
+    v_str = bytearray(s[4:])
+    neg = False
+    i = v_str[0]
+    if i & 0x80:
+        neg = True
+        i &= ~0x80
+        v_str[0] = i
+
+    v = bin2bn(v_str)
+
+    if neg:
+        return -v
+    return v
+
+# bitcoin-specific little endian format, with implicit size
+def mpi2vch(s):
+    r = s[4:]           # strip size
+    r = r[::-1]         # reverse string, converting BE->LE
+    return r
+
+def bn2vch(v):
+    return bytes(mpi2vch(bn2mpi(v)))
+
+def vch2mpi(s):
+    r = struct.pack(b">I", len(s))   # size
+    r += s[::-1]            # reverse string, converting LE->BE
+    return r
+
+def vch2bn(s):
+    return mpi2bn(vch2mpi(s))
+

basicswap/interface/contrib/firo_test_framework/coverage.py

@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+"""
+This module contains utilities for doing coverage analysis on the RPC
+interface.
+
+It provides a way to track which RPC commands are exercised during
+testing.
+
+"""
+import os
+
+
+REFERENCE_FILENAME = 'rpc_interface.txt'
+
+
+class AuthServiceProxyWrapper(object):
+    """
+    An object that wraps AuthServiceProxy to record specific RPC calls.
+
+    """
+    def __init__(self, auth_service_proxy_instance, coverage_logfile=None):
+        """
+        Kwargs:
+            auth_service_proxy_instance (AuthServiceProxy): the instance
+                being wrapped.
+            coverage_logfile (str): if specified, write each service_name
+                out to a file when called.
+
+        """
+        self.auth_service_proxy_instance = auth_service_proxy_instance
+        self.coverage_logfile = coverage_logfile
+
+    def __getattr__(self, *args, **kwargs):
+        return_val = self.auth_service_proxy_instance.__getattr__(
+            *args, **kwargs)
+
+        return AuthServiceProxyWrapper(return_val, self.coverage_logfile)
+
+    def __call__(self, *args, **kwargs):
+        """
+        Delegates to AuthServiceProxy, then writes the particular RPC method
+        called to a file.
+
+        """
+        return_val = self.auth_service_proxy_instance.__call__(*args, **kwargs)
+        rpc_method = self.auth_service_proxy_instance._service_name
+
+        if self.coverage_logfile:
+            with open(self.coverage_logfile, 'a+', encoding='utf8') as f:
+                f.write("%s\n" % rpc_method)
+
+        return return_val
+
+    @property
+    def url(self):
+        return self.auth_service_proxy_instance.url
+
+
+def get_filename(dirname, n_node):
+    """
+    Get a filename unique to the test process ID and node.
+
+    This file will contain a list of RPC commands covered.
+    """
+    pid = str(os.getpid())
+    return os.path.join(
+        dirname, "coverage.pid%s.node%s.txt" % (pid, str(n_node)))
+
+
+def write_all_rpc_commands(dirname, node):
+    """
+    Write out a list of all RPC functions available in `bitcoin-cli` for
+    coverage comparison. This will only happen once per coverage
+    directory.
+
+    Args:
+        dirname (str): temporary test dir
+        node (AuthServiceProxy): client
+
+    Returns:
+        bool. if the RPC interface file was written.
+
+    """
+    filename = os.path.join(dirname, REFERENCE_FILENAME)
+
+    if os.path.isfile(filename):
+        return False
+
+    help_output = node.help().split('\n')
+    commands = set()
+
+    for line in help_output:
+        line = line.strip()
+
+        # Ignore blanks and headers
+        if line and not line.startswith('='):
+            commands.add("%s\n" % line.split()[0])
+
+    with open(filename, 'w', encoding='utf8') as f:
+        f.writelines(list(commands))
+
+    return True

basicswap/interface/contrib/firo_test_framework/script.py

@@ -0,0 +1,943 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# script.py
+#
+# This file is modified from python-bitcoinlib.
+#
+
+"""Scripts
+
+Functionality to build scripts, as well as SignatureHash().
+"""
+
+
+from .mininode import CTransaction, CTxOut, sha256, hash256, uint256_from_str, ser_uint256, ser_string
+from binascii import hexlify
+import hashlib
+
+import sys
+bchr = chr
+bord = ord
+if sys.version > '3':
+    long = int
+    bchr = lambda x: bytes([x])
+    bord = lambda x: x
+
+import struct
+
+from .bignum import bn2vch
+
+MAX_SCRIPT_SIZE = 10000
+MAX_SCRIPT_ELEMENT_SIZE = 520
+MAX_SCRIPT_OPCODES = 201
+
+OPCODE_NAMES = {}
+
+_opcode_instances = []
+class CScriptOp(int):
+    """A single script opcode"""
+    __slots__ = []
+
+    @staticmethod
+    def encode_op_pushdata(d):
+        """Encode a PUSHDATA op, returning bytes"""
+        if len(d) < 0x4c:
+            return b'' + bchr(len(d)) + d # OP_PUSHDATA
+        elif len(d) <= 0xff:
+            return b'\x4c' + bchr(len(d)) + d # OP_PUSHDATA1
+        elif len(d) <= 0xffff:
+            return b'\x4d' + struct.pack(b'<H', len(d)) + d # OP_PUSHDATA2
+        elif len(d) <= 0xffffffff:
+            return b'\x4e' + struct.pack(b'<I', len(d)) + d # OP_PUSHDATA4
+        else:
+            raise ValueError("Data too long to encode in a PUSHDATA op")
+
+    @staticmethod
+    def encode_op_n(n):
+        """Encode a small integer op, returning an opcode"""
+        if not (0 <= n <= 16):
+            raise ValueError('Integer must be in range 0 <= n <= 16, got %d' % n)
+
+        if n == 0:
+            return OP_0
+        else:
+            return CScriptOp(OP_1 + n-1)
+
+    def decode_op_n(self):
+        """Decode a small integer opcode, returning an integer"""
+        if self == OP_0:
+            return 0
+
+        if not (self == OP_0 or OP_1 <= self <= OP_16):
+            raise ValueError('op %r is not an OP_N' % self)
+
+        return int(self - OP_1+1)
+
+    def is_small_int(self):
+        """Return true if the op pushes a small integer to the stack"""
+        if 0x51 <= self <= 0x60 or self == 0:
+            return True
+        else:
+            return False
+
+    def __str__(self):
+        return repr(self)
+
+    def __repr__(self):
+        if self in OPCODE_NAMES:
+            return OPCODE_NAMES[self]
+        else:
+            return 'CScriptOp(0x%x)' % self
+
+    def __new__(cls, n):
+        try:
+            return _opcode_instances[n]
+        except IndexError:
+            assert len(_opcode_instances) == n
+            _opcode_instances.append(super(CScriptOp, cls).__new__(cls, n))
+            return _opcode_instances[n]
+
+# Populate opcode instance table
+for n in range(0xff+1):
+    CScriptOp(n)
+
+
+# push value
+OP_0 = CScriptOp(0x00)
+OP_FALSE = OP_0
+OP_PUSHDATA1 = CScriptOp(0x4c)
+OP_PUSHDATA2 = CScriptOp(0x4d)
+OP_PUSHDATA4 = CScriptOp(0x4e)
+OP_1NEGATE = CScriptOp(0x4f)
+OP_RESERVED = CScriptOp(0x50)
+OP_1 = CScriptOp(0x51)
+OP_TRUE=OP_1
+OP_2 = CScriptOp(0x52)
+OP_3 = CScriptOp(0x53)
+OP_4 = CScriptOp(0x54)
+OP_5 = CScriptOp(0x55)
+OP_6 = CScriptOp(0x56)
+OP_7 = CScriptOp(0x57)
+OP_8 = CScriptOp(0x58)
+OP_9 = CScriptOp(0x59)
+OP_10 = CScriptOp(0x5a)
+OP_11 = CScriptOp(0x5b)
+OP_12 = CScriptOp(0x5c)
+OP_13 = CScriptOp(0x5d)
+OP_14 = CScriptOp(0x5e)
+OP_15 = CScriptOp(0x5f)
+OP_16 = CScriptOp(0x60)
+
+# control
+OP_NOP = CScriptOp(0x61)
+OP_VER = CScriptOp(0x62)
+OP_IF = CScriptOp(0x63)
+OP_NOTIF = CScriptOp(0x64)
+OP_VERIF = CScriptOp(0x65)
+OP_VERNOTIF = CScriptOp(0x66)
+OP_ELSE = CScriptOp(0x67)
+OP_ENDIF = CScriptOp(0x68)
+OP_VERIFY = CScriptOp(0x69)
+OP_RETURN = CScriptOp(0x6a)
+
+# stack ops
+OP_TOALTSTACK = CScriptOp(0x6b)
+OP_FROMALTSTACK = CScriptOp(0x6c)
+OP_2DROP = CScriptOp(0x6d)
+OP_2DUP = CScriptOp(0x6e)
+OP_3DUP = CScriptOp(0x6f)
+OP_2OVER = CScriptOp(0x70)
+OP_2ROT = CScriptOp(0x71)
+OP_2SWAP = CScriptOp(0x72)
+OP_IFDUP = CScriptOp(0x73)
+OP_DEPTH = CScriptOp(0x74)
+OP_DROP = CScriptOp(0x75)
+OP_DUP = CScriptOp(0x76)
+OP_NIP = CScriptOp(0x77)
+OP_OVER = CScriptOp(0x78)
+OP_PICK = CScriptOp(0x79)
+OP_ROLL = CScriptOp(0x7a)
+OP_ROT = CScriptOp(0x7b)
+OP_SWAP = CScriptOp(0x7c)
+OP_TUCK = CScriptOp(0x7d)
+
+# splice ops
+OP_CAT = CScriptOp(0x7e)
+OP_SUBSTR = CScriptOp(0x7f)
+OP_LEFT = CScriptOp(0x80)
+OP_RIGHT = CScriptOp(0x81)
+OP_SIZE = CScriptOp(0x82)
+
+# bit logic
+OP_INVERT = CScriptOp(0x83)
+OP_AND = CScriptOp(0x84)
+OP_OR = CScriptOp(0x85)
+OP_XOR = CScriptOp(0x86)
+OP_EQUAL = CScriptOp(0x87)
+OP_EQUALVERIFY = CScriptOp(0x88)
+OP_RESERVED1 = CScriptOp(0x89)
+OP_RESERVED2 = CScriptOp(0x8a)
+
+# numeric
+OP_1ADD = CScriptOp(0x8b)
+OP_1SUB = CScriptOp(0x8c)
+OP_2MUL = CScriptOp(0x8d)
+OP_2DIV = CScriptOp(0x8e)
+OP_NEGATE = CScriptOp(0x8f)
+OP_ABS = CScriptOp(0x90)
+OP_NOT = CScriptOp(0x91)
+OP_0NOTEQUAL = CScriptOp(0x92)
+
+OP_ADD = CScriptOp(0x93)
+OP_SUB = CScriptOp(0x94)
+OP_MUL = CScriptOp(0x95)
+OP_DIV = CScriptOp(0x96)
+OP_MOD = CScriptOp(0x97)
+OP_LSHIFT = CScriptOp(0x98)
+OP_RSHIFT = CScriptOp(0x99)
+
+OP_BOOLAND = CScriptOp(0x9a)
+OP_BOOLOR = CScriptOp(0x9b)
+OP_NUMEQUAL = CScriptOp(0x9c)
+OP_NUMEQUALVERIFY = CScriptOp(0x9d)
+OP_NUMNOTEQUAL = CScriptOp(0x9e)
+OP_LESSTHAN = CScriptOp(0x9f)
+OP_GREATERTHAN = CScriptOp(0xa0)
+OP_LESSTHANOREQUAL = CScriptOp(0xa1)
+OP_GREATERTHANOREQUAL = CScriptOp(0xa2)
+OP_MIN = CScriptOp(0xa3)
+OP_MAX = CScriptOp(0xa4)
+
+OP_WITHIN = CScriptOp(0xa5)
+
+# crypto
+OP_RIPEMD160 = CScriptOp(0xa6)
+OP_SHA1 = CScriptOp(0xa7)
+OP_SHA256 = CScriptOp(0xa8)
+OP_HASH160 = CScriptOp(0xa9)
+OP_HASH256 = CScriptOp(0xaa)
+OP_CODESEPARATOR = CScriptOp(0xab)
+OP_CHECKSIG = CScriptOp(0xac)
+OP_CHECKSIGVERIFY = CScriptOp(0xad)
+OP_CHECKMULTISIG = CScriptOp(0xae)
+OP_CHECKMULTISIGVERIFY = CScriptOp(0xaf)
+
+# expansion
+OP_NOP1 = CScriptOp(0xb0)
+OP_CHECKLOCKTIMEVERIFY = CScriptOp(0xb1)
+OP_CHECKSEQUENCEVERIFY = CScriptOp(0xb2)
+OP_NOP4 = CScriptOp(0xb3)
+OP_NOP5 = CScriptOp(0xb4)
+OP_NOP6 = CScriptOp(0xb5)
+OP_NOP7 = CScriptOp(0xb6)
+OP_NOP8 = CScriptOp(0xb7)
+OP_NOP9 = CScriptOp(0xb8)
+OP_NOP10 = CScriptOp(0xb9)
+
+# template matching params
+OP_SMALLINTEGER = CScriptOp(0xfa)
+OP_PUBKEYS = CScriptOp(0xfb)
+OP_PUBKEYHASH = CScriptOp(0xfd)
+OP_PUBKEY = CScriptOp(0xfe)
+
+OP_INVALIDOPCODE = CScriptOp(0xff)
+
+VALID_OPCODES = {
+    OP_1NEGATE,
+    OP_RESERVED,
+    OP_1,
+    OP_2,
+    OP_3,
+    OP_4,
+    OP_5,
+    OP_6,
+    OP_7,
+    OP_8,
+    OP_9,
+    OP_10,
+    OP_11,
+    OP_12,
+    OP_13,
+    OP_14,
+    OP_15,
+    OP_16,
+
+    OP_NOP,
+    OP_VER,
+    OP_IF,
+    OP_NOTIF,
+    OP_VERIF,
+    OP_VERNOTIF,
+    OP_ELSE,
+    OP_ENDIF,
+    OP_VERIFY,
+    OP_RETURN,
+
+    OP_TOALTSTACK,
+    OP_FROMALTSTACK,
+    OP_2DROP,
+    OP_2DUP,
+    OP_3DUP,
+    OP_2OVER,
+    OP_2ROT,
+    OP_2SWAP,
+    OP_IFDUP,
+    OP_DEPTH,
+    OP_DROP,
+    OP_DUP,
+    OP_NIP,
+    OP_OVER,
+    OP_PICK,
+    OP_ROLL,
+    OP_ROT,
+    OP_SWAP,
+    OP_TUCK,
+
+    OP_CAT,
+    OP_SUBSTR,
+    OP_LEFT,
+    OP_RIGHT,
+    OP_SIZE,
+
+    OP_INVERT,
+    OP_AND,
+    OP_OR,
+    OP_XOR,
+    OP_EQUAL,
+    OP_EQUALVERIFY,
+    OP_RESERVED1,
+    OP_RESERVED2,
+
+    OP_1ADD,
+    OP_1SUB,
+    OP_2MUL,
+    OP_2DIV,
+    OP_NEGATE,
+    OP_ABS,
+    OP_NOT,
+    OP_0NOTEQUAL,
+
+    OP_ADD,
+    OP_SUB,
+    OP_MUL,
+    OP_DIV,
+    OP_MOD,
+    OP_LSHIFT,
+    OP_RSHIFT,
+
+    OP_BOOLAND,
+    OP_BOOLOR,
+    OP_NUMEQUAL,
+    OP_NUMEQUALVERIFY,
+    OP_NUMNOTEQUAL,
+    OP_LESSTHAN,
+    OP_GREATERTHAN,
+    OP_LESSTHANOREQUAL,
+    OP_GREATERTHANOREQUAL,
+    OP_MIN,
+    OP_MAX,
+
+    OP_WITHIN,
+
+    OP_RIPEMD160,
+    OP_SHA1,
+    OP_SHA256,
+    OP_HASH160,
+    OP_HASH256,
+    OP_CODESEPARATOR,
+    OP_CHECKSIG,
+    OP_CHECKSIGVERIFY,
+    OP_CHECKMULTISIG,
+    OP_CHECKMULTISIGVERIFY,
+
+    OP_NOP1,
+    OP_CHECKLOCKTIMEVERIFY,
+    OP_CHECKSEQUENCEVERIFY,
+    OP_NOP4,
+    OP_NOP5,
+    OP_NOP6,
+    OP_NOP7,
+    OP_NOP8,
+    OP_NOP9,
+    OP_NOP10,
+
+    OP_SMALLINTEGER,
+    OP_PUBKEYS,
+    OP_PUBKEYHASH,
+    OP_PUBKEY,
+}
+
+OPCODE_NAMES.update({
+    OP_0 : 'OP_0',
+    OP_PUSHDATA1 : 'OP_PUSHDATA1',
+    OP_PUSHDATA2 : 'OP_PUSHDATA2',
+    OP_PUSHDATA4 : 'OP_PUSHDATA4',
+    OP_1NEGATE : 'OP_1NEGATE',
+    OP_RESERVED : 'OP_RESERVED',
+    OP_1 : 'OP_1',
+    OP_2 : 'OP_2',
+    OP_3 : 'OP_3',
+    OP_4 : 'OP_4',
+    OP_5 : 'OP_5',
+    OP_6 : 'OP_6',
+    OP_7 : 'OP_7',
+    OP_8 : 'OP_8',
+    OP_9 : 'OP_9',
+    OP_10 : 'OP_10',
+    OP_11 : 'OP_11',
+    OP_12 : 'OP_12',
+    OP_13 : 'OP_13',
+    OP_14 : 'OP_14',
+    OP_15 : 'OP_15',
+    OP_16 : 'OP_16',
+    OP_NOP : 'OP_NOP',
+    OP_VER : 'OP_VER',
+    OP_IF : 'OP_IF',
+    OP_NOTIF : 'OP_NOTIF',
+    OP_VERIF : 'OP_VERIF',
+    OP_VERNOTIF : 'OP_VERNOTIF',
+    OP_ELSE : 'OP_ELSE',
+    OP_ENDIF : 'OP_ENDIF',
+    OP_VERIFY : 'OP_VERIFY',
+    OP_RETURN : 'OP_RETURN',
+    OP_TOALTSTACK : 'OP_TOALTSTACK',
+    OP_FROMALTSTACK : 'OP_FROMALTSTACK',
+    OP_2DROP : 'OP_2DROP',
+    OP_2DUP : 'OP_2DUP',
+    OP_3DUP : 'OP_3DUP',
+    OP_2OVER : 'OP_2OVER',
+    OP_2ROT : 'OP_2ROT',
+    OP_2SWAP : 'OP_2SWAP',
+    OP_IFDUP : 'OP_IFDUP',
+    OP_DEPTH : 'OP_DEPTH',
+    OP_DROP : 'OP_DROP',
+    OP_DUP : 'OP_DUP',
+    OP_NIP : 'OP_NIP',
+    OP_OVER : 'OP_OVER',
+    OP_PICK : 'OP_PICK',
+    OP_ROLL : 'OP_ROLL',
+    OP_ROT : 'OP_ROT',
+    OP_SWAP : 'OP_SWAP',
+    OP_TUCK : 'OP_TUCK',
+    OP_CAT : 'OP_CAT',
+    OP_SUBSTR : 'OP_SUBSTR',
+    OP_LEFT : 'OP_LEFT',
+    OP_RIGHT : 'OP_RIGHT',
+    OP_SIZE : 'OP_SIZE',
+    OP_INVERT : 'OP_INVERT',
+    OP_AND : 'OP_AND',
+    OP_OR : 'OP_OR',
+    OP_XOR : 'OP_XOR',
+    OP_EQUAL : 'OP_EQUAL',
+    OP_EQUALVERIFY : 'OP_EQUALVERIFY',
+    OP_RESERVED1 : 'OP_RESERVED1',
+    OP_RESERVED2 : 'OP_RESERVED2',
+    OP_1ADD : 'OP_1ADD',
+    OP_1SUB : 'OP_1SUB',
+    OP_2MUL : 'OP_2MUL',
+    OP_2DIV : 'OP_2DIV',
+    OP_NEGATE : 'OP_NEGATE',
+    OP_ABS : 'OP_ABS',
+    OP_NOT : 'OP_NOT',
+    OP_0NOTEQUAL : 'OP_0NOTEQUAL',
+    OP_ADD : 'OP_ADD',
+    OP_SUB : 'OP_SUB',
+    OP_MUL : 'OP_MUL',
+    OP_DIV : 'OP_DIV',
+    OP_MOD : 'OP_MOD',
+    OP_LSHIFT : 'OP_LSHIFT',
+    OP_RSHIFT : 'OP_RSHIFT',
+    OP_BOOLAND : 'OP_BOOLAND',
+    OP_BOOLOR : 'OP_BOOLOR',
+    OP_NUMEQUAL : 'OP_NUMEQUAL',
+    OP_NUMEQUALVERIFY : 'OP_NUMEQUALVERIFY',
+    OP_NUMNOTEQUAL : 'OP_NUMNOTEQUAL',
+    OP_LESSTHAN : 'OP_LESSTHAN',
+    OP_GREATERTHAN : 'OP_GREATERTHAN',
+    OP_LESSTHANOREQUAL : 'OP_LESSTHANOREQUAL',
+    OP_GREATERTHANOREQUAL : 'OP_GREATERTHANOREQUAL',
+    OP_MIN : 'OP_MIN',
+    OP_MAX : 'OP_MAX',
+    OP_WITHIN : 'OP_WITHIN',
+    OP_RIPEMD160 : 'OP_RIPEMD160',
+    OP_SHA1 : 'OP_SHA1',
+    OP_SHA256 : 'OP_SHA256',
+    OP_HASH160 : 'OP_HASH160',
+    OP_HASH256 : 'OP_HASH256',
+    OP_CODESEPARATOR : 'OP_CODESEPARATOR',
+    OP_CHECKSIG : 'OP_CHECKSIG',
+    OP_CHECKSIGVERIFY : 'OP_CHECKSIGVERIFY',
+    OP_CHECKMULTISIG : 'OP_CHECKMULTISIG',
+    OP_CHECKMULTISIGVERIFY : 'OP_CHECKMULTISIGVERIFY',
+    OP_NOP1 : 'OP_NOP1',
+    OP_CHECKLOCKTIMEVERIFY : 'OP_CHECKLOCKTIMEVERIFY',
+    OP_CHECKSEQUENCEVERIFY : 'OP_CHECKSEQUENCEVERIFY',
+    OP_NOP4 : 'OP_NOP4',
+    OP_NOP5 : 'OP_NOP5',
+    OP_NOP6 : 'OP_NOP6',
+    OP_NOP7 : 'OP_NOP7',
+    OP_NOP8 : 'OP_NOP8',
+    OP_NOP9 : 'OP_NOP9',
+    OP_NOP10 : 'OP_NOP10',
+    OP_SMALLINTEGER : 'OP_SMALLINTEGER',
+    OP_PUBKEYS : 'OP_PUBKEYS',
+    OP_PUBKEYHASH : 'OP_PUBKEYHASH',
+    OP_PUBKEY : 'OP_PUBKEY',
+    OP_INVALIDOPCODE : 'OP_INVALIDOPCODE',
+})
+
+OPCODES_BY_NAME = {
+    'OP_0' : OP_0,
+    'OP_PUSHDATA1' : OP_PUSHDATA1,
+    'OP_PUSHDATA2' : OP_PUSHDATA2,
+    'OP_PUSHDATA4' : OP_PUSHDATA4,
+    'OP_1NEGATE' : OP_1NEGATE,
+    'OP_RESERVED' : OP_RESERVED,
+    'OP_1' : OP_1,
+    'OP_2' : OP_2,
+    'OP_3' : OP_3,
+    'OP_4' : OP_4,
+    'OP_5' : OP_5,
+    'OP_6' : OP_6,
+    'OP_7' : OP_7,
+    'OP_8' : OP_8,
+    'OP_9' : OP_9,
+    'OP_10' : OP_10,
+    'OP_11' : OP_11,
+    'OP_12' : OP_12,
+    'OP_13' : OP_13,
+    'OP_14' : OP_14,
+    'OP_15' : OP_15,
+    'OP_16' : OP_16,
+    'OP_NOP' : OP_NOP,
+    'OP_VER' : OP_VER,
+    'OP_IF' : OP_IF,
+    'OP_NOTIF' : OP_NOTIF,
+    'OP_VERIF' : OP_VERIF,
+    'OP_VERNOTIF' : OP_VERNOTIF,
+    'OP_ELSE' : OP_ELSE,
+    'OP_ENDIF' : OP_ENDIF,
+    'OP_VERIFY' : OP_VERIFY,
+    'OP_RETURN' : OP_RETURN,
+    'OP_TOALTSTACK' : OP_TOALTSTACK,
+    'OP_FROMALTSTACK' : OP_FROMALTSTACK,
+    'OP_2DROP' : OP_2DROP,
+    'OP_2DUP' : OP_2DUP,
+    'OP_3DUP' : OP_3DUP,
+    'OP_2OVER' : OP_2OVER,
+    'OP_2ROT' : OP_2ROT,
+    'OP_2SWAP' : OP_2SWAP,
+    'OP_IFDUP' : OP_IFDUP,
+    'OP_DEPTH' : OP_DEPTH,
+    'OP_DROP' : OP_DROP,
+    'OP_DUP' : OP_DUP,
+    'OP_NIP' : OP_NIP,
+    'OP_OVER' : OP_OVER,
+    'OP_PICK' : OP_PICK,
+    'OP_ROLL' : OP_ROLL,
+    'OP_ROT' : OP_ROT,
+    'OP_SWAP' : OP_SWAP,
+    'OP_TUCK' : OP_TUCK,
+    'OP_CAT' : OP_CAT,
+    'OP_SUBSTR' : OP_SUBSTR,
+    'OP_LEFT' : OP_LEFT,
+    'OP_RIGHT' : OP_RIGHT,
+    'OP_SIZE' : OP_SIZE,
+    'OP_INVERT' : OP_INVERT,
+    'OP_AND' : OP_AND,
+    'OP_OR' : OP_OR,
+    'OP_XOR' : OP_XOR,
+    'OP_EQUAL' : OP_EQUAL,
+    'OP_EQUALVERIFY' : OP_EQUALVERIFY,
+    'OP_RESERVED1' : OP_RESERVED1,
+    'OP_RESERVED2' : OP_RESERVED2,
+    'OP_1ADD' : OP_1ADD,
+    'OP_1SUB' : OP_1SUB,
+    'OP_2MUL' : OP_2MUL,
+    'OP_2DIV' : OP_2DIV,
+    'OP_NEGATE' : OP_NEGATE,
+    'OP_ABS' : OP_ABS,
+    'OP_NOT' : OP_NOT,
+    'OP_0NOTEQUAL' : OP_0NOTEQUAL,
+    'OP_ADD' : OP_ADD,
+    'OP_SUB' : OP_SUB,
+    'OP_MUL' : OP_MUL,
+    'OP_DIV' : OP_DIV,
+    'OP_MOD' : OP_MOD,
+    'OP_LSHIFT' : OP_LSHIFT,
+    'OP_RSHIFT' : OP_RSHIFT,
+    'OP_BOOLAND' : OP_BOOLAND,
+    'OP_BOOLOR' : OP_BOOLOR,
+    'OP_NUMEQUAL' : OP_NUMEQUAL,
+    'OP_NUMEQUALVERIFY' : OP_NUMEQUALVERIFY,
+    'OP_NUMNOTEQUAL' : OP_NUMNOTEQUAL,
+    'OP_LESSTHAN' : OP_LESSTHAN,
+    'OP_GREATERTHAN' : OP_GREATERTHAN,
+    'OP_LESSTHANOREQUAL' : OP_LESSTHANOREQUAL,
+    'OP_GREATERTHANOREQUAL' : OP_GREATERTHANOREQUAL,
+    'OP_MIN' : OP_MIN,
+    'OP_MAX' : OP_MAX,
+    'OP_WITHIN' : OP_WITHIN,
+    'OP_RIPEMD160' : OP_RIPEMD160,
+    'OP_SHA1' : OP_SHA1,
+    'OP_SHA256' : OP_SHA256,
+    'OP_HASH160' : OP_HASH160,
+    'OP_HASH256' : OP_HASH256,
+    'OP_CODESEPARATOR' : OP_CODESEPARATOR,
+    'OP_CHECKSIG' : OP_CHECKSIG,
+    'OP_CHECKSIGVERIFY' : OP_CHECKSIGVERIFY,
+    'OP_CHECKMULTISIG' : OP_CHECKMULTISIG,
+    'OP_CHECKMULTISIGVERIFY' : OP_CHECKMULTISIGVERIFY,
+    'OP_NOP1' : OP_NOP1,
+    'OP_CHECKLOCKTIMEVERIFY' : OP_CHECKLOCKTIMEVERIFY,
+    'OP_CHECKSEQUENCEVERIFY' : OP_CHECKSEQUENCEVERIFY,
+    'OP_NOP4' : OP_NOP4,
+    'OP_NOP5' : OP_NOP5,
+    'OP_NOP6' : OP_NOP6,
+    'OP_NOP7' : OP_NOP7,
+    'OP_NOP8' : OP_NOP8,
+    'OP_NOP9' : OP_NOP9,
+    'OP_NOP10' : OP_NOP10,
+    'OP_SMALLINTEGER' : OP_SMALLINTEGER,
+    'OP_PUBKEYS' : OP_PUBKEYS,
+    'OP_PUBKEYHASH' : OP_PUBKEYHASH,
+    'OP_PUBKEY' : OP_PUBKEY,
+}
+
+class CScriptInvalidError(Exception):
+    """Base class for CScript exceptions"""
+    pass
+
+class CScriptTruncatedPushDataError(CScriptInvalidError):
+    """Invalid pushdata due to truncation"""
+    def __init__(self, msg, data):
+        self.data = data
+        super(CScriptTruncatedPushDataError, self).__init__(msg)
+
+# This is used, eg, for blockchain heights in coinbase scripts (bip34)
+class CScriptNum(object):
+    def __init__(self, d=0):
+        self.value = d
+
+    @staticmethod
+    def encode(obj):
+        r = bytearray(0)
+        if obj.value == 0:
+            return bytes(r)
+        neg = obj.value < 0
+        absvalue = -obj.value if neg else obj.value
+        while (absvalue):
+            r.append(absvalue & 0xff)
+            absvalue >>= 8
+        if r[-1] & 0x80:
+            r.append(0x80 if neg else 0)
+        elif neg:
+            r[-1] |= 0x80
+        return bytes(bchr(len(r)) + r)
+
+
+class CScript(bytes):
+    """Serialized script
+
+    A bytes subclass, so you can use this directly whenever bytes are accepted.
+    Note that this means that indexing does *not* work - you'll get an index by
+    byte rather than opcode. This format was chosen for efficiency so that the
+    general case would not require creating a lot of little CScriptOP objects.
+
+    iter(script) however does iterate by opcode.
+    """
+    @classmethod
+    def __coerce_instance(cls, other):
+        # Coerce other into bytes
+        if isinstance(other, CScriptOp):
+            other = bchr(other)
+        elif isinstance(other, CScriptNum):
+            if (other.value == 0):
+                other = bchr(CScriptOp(OP_0))
+            else:
+                other = CScriptNum.encode(other)
+        elif isinstance(other, int):
+            if 0 <= other <= 16:
+                other = bytes(bchr(CScriptOp.encode_op_n(other)))
+            elif other == -1:
+                other = bytes(bchr(OP_1NEGATE))
+            else:
+                other = CScriptOp.encode_op_pushdata(bn2vch(other))
+        elif isinstance(other, (bytes, bytearray)):
+            other = CScriptOp.encode_op_pushdata(other)
+        return other
+
+    def __add__(self, other):
+        # Do the coercion outside of the try block so that errors in it are
+        # noticed.
+        other = self.__coerce_instance(other)
+
+        try:
+            # bytes.__add__ always returns bytes instances unfortunately
+            return CScript(super(CScript, self).__add__(other))
+        except TypeError:
+            raise TypeError('Can not add a %r instance to a CScript' % other.__class__)
+
+    def join(self, iterable):
+        # join makes no sense for a CScript()
+        raise NotImplementedError
+
+    def __new__(cls, value=b''):
+        if isinstance(value, bytes) or isinstance(value, bytearray):
+            return super(CScript, cls).__new__(cls, value)
+        else:
+            def coerce_iterable(iterable):
+                for instance in iterable:
+                    yield cls.__coerce_instance(instance)
+            # Annoyingly on both python2 and python3 bytes.join() always
+            # returns a bytes instance even when subclassed.
+            return super(CScript, cls).__new__(cls, b''.join(coerce_iterable(value)))
+
+    def raw_iter(self):
+        """Raw iteration
+
+        Yields tuples of (opcode, data, sop_idx) so that the different possible
+        PUSHDATA encodings can be accurately distinguished, as well as
+        determining the exact opcode byte indexes. (sop_idx)
+        """
+        i = 0
+        while i < len(self):
+            sop_idx = i
+            opcode = bord(self[i])
+            i += 1
+
+            if opcode > OP_PUSHDATA4:
+                yield (opcode, None, sop_idx)
+            else:
+                datasize = None
+                pushdata_type = None
+                if opcode < OP_PUSHDATA1:
+                    pushdata_type = 'PUSHDATA(%d)' % opcode
+                    datasize = opcode
+
+                elif opcode == OP_PUSHDATA1:
+                    pushdata_type = 'PUSHDATA1'
+                    if i >= len(self):
+                        raise CScriptInvalidError('PUSHDATA1: missing data length')
+                    datasize = bord(self[i])
+                    i += 1
+
+                elif opcode == OP_PUSHDATA2:
+                    pushdata_type = 'PUSHDATA2'
+                    if i + 1 >= len(self):
+                        raise CScriptInvalidError('PUSHDATA2: missing data length')
+                    datasize = bord(self[i]) + (bord(self[i+1]) << 8)
+                    i += 2
+
+                elif opcode == OP_PUSHDATA4:
+                    pushdata_type = 'PUSHDATA4'
+                    if i + 3 >= len(self):
+                        raise CScriptInvalidError('PUSHDATA4: missing data length')
+                    datasize = bord(self[i]) + (bord(self[i+1]) << 8) + (bord(self[i+2]) << 16) + (bord(self[i+3]) << 24)
+                    i += 4
+
+                else:
+                    assert False # shouldn't happen
+
+
+                data = bytes(self[i:i+datasize])
+
+                # Check for truncation
+                if len(data) < datasize:
+                    raise CScriptTruncatedPushDataError('%s: truncated data' % pushdata_type, data)
+
+                i += datasize
+
+                yield (opcode, data, sop_idx)
+
+    def __iter__(self):
+        """'Cooked' iteration
+
+        Returns either a CScriptOP instance, an integer, or bytes, as
+        appropriate.
+
+        See raw_iter() if you need to distinguish the different possible
+        PUSHDATA encodings.
+        """
+        for (opcode, data, sop_idx) in self.raw_iter():
+            if data is not None:
+                yield data
+            else:
+                opcode = CScriptOp(opcode)
+
+                if opcode.is_small_int():
+                    yield opcode.decode_op_n()
+                else:
+                    yield CScriptOp(opcode)
+
+    def __repr__(self):
+        # For Python3 compatibility add b before strings so testcases don't
+        # need to change
+        def _repr(o):
+            if isinstance(o, bytes):
+                return b"x('%s')" % hexlify(o).decode('ascii')
+            else:
+                return repr(o)
+
+        ops = []
+        i = iter(self)
+        while True:
+            op = None
+            try:
+                op = _repr(next(i))
+            except CScriptTruncatedPushDataError as err:
+                op = '%s...<ERROR: %s>' % (_repr(err.data), err)
+                break
+            except CScriptInvalidError as err:
+                op = '<ERROR: %s>' % err
+                break
+            except StopIteration:
+                break
+            finally:
+                if op is not None:
+                    ops.append(op)
+
+        return "CScript([%s])" % ', '.join(ops)
+
+    def GetSigOpCount(self, fAccurate):
+        """Get the SigOp count.
+
+        fAccurate - Accurately count CHECKMULTISIG, see BIP16 for details.
+
+        Note that this is consensus-critical.
+        """
+        n = 0
+        lastOpcode = OP_INVALIDOPCODE
+        for (opcode, data, sop_idx) in self.raw_iter():
+            if opcode in (OP_CHECKSIG, OP_CHECKSIGVERIFY):
+                n += 1
+            elif opcode in (OP_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY):
+                if fAccurate and (OP_1 <= lastOpcode <= OP_16):
+                    n += opcode.decode_op_n()
+                else:
+                    n += 20
+            lastOpcode = opcode
+        return n
+
+
+SIGHASH_ALL = 1
+SIGHASH_NONE = 2
+SIGHASH_SINGLE = 3
+SIGHASH_ANYONECANPAY = 0x80
+
+def FindAndDelete(script, sig):
+    """Consensus critical, see FindAndDelete() in Satoshi codebase"""
+    r = b''
+    last_sop_idx = sop_idx = 0
+    skip = True
+    for (opcode, data, sop_idx) in script.raw_iter():
+        if not skip:
+            r += script[last_sop_idx:sop_idx]
+        last_sop_idx = sop_idx
+        if script[sop_idx:sop_idx + len(sig)] == sig:
+            skip = True
+        else:
+            skip = False
+    if not skip:
+        r += script[last_sop_idx:]
+    return CScript(r)
+
+
+def SignatureHash(script, txTo, inIdx, hashtype):
+    """Consensus-correct SignatureHash
+
+    Returns (hash, err) to precisely match the consensus-critical behavior of
+    the SIGHASH_SINGLE bug. (inIdx is *not* checked for validity)
+    """
+    HASH_ONE = b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+
+    if inIdx >= len(txTo.vin):
+        return (HASH_ONE, "inIdx %d out of range (%d)" % (inIdx, len(txTo.vin)))
+    txtmp = CTransaction(txTo)
+
+    for txin in txtmp.vin:
+        txin.scriptSig = b''
+    txtmp.vin[inIdx].scriptSig = FindAndDelete(script, CScript([OP_CODESEPARATOR]))
+
+    if (hashtype & 0x1f) == SIGHASH_NONE:
+        txtmp.vout = []
+
+        for i in range(len(txtmp.vin)):
+            if i != inIdx:
+                txtmp.vin[i].nSequence = 0
+
+    elif (hashtype & 0x1f) == SIGHASH_SINGLE:
+        outIdx = inIdx
+        if outIdx >= len(txtmp.vout):
+            return (HASH_ONE, "outIdx %d out of range (%d)" % (outIdx, len(txtmp.vout)))
+
+        tmp = txtmp.vout[outIdx]
+        txtmp.vout = []
+        for i in range(outIdx):
+            txtmp.vout.append(CTxOut(-1))
+        txtmp.vout.append(tmp)
+
+        for i in range(len(txtmp.vin)):
+            if i != inIdx:
+                txtmp.vin[i].nSequence = 0
+
+    if hashtype & SIGHASH_ANYONECANPAY:
+        tmp = txtmp.vin[inIdx]
+        txtmp.vin = []
+        txtmp.vin.append(tmp)
+
+    s = txtmp.serialize()
+    s += struct.pack(b"<I", hashtype)
+
+    hash = hash256(s)
+
+    return (hash, None)
+
+# TODO: Allow cached hashPrevouts/hashSequence/hashOutputs to be provided.
+# Performance optimization probably not necessary for python tests, however.
+# Note that this corresponds to sigversion == 1 in EvalScript, which is used
+# for version 0 witnesses.
+def SegwitVersion1SignatureHash(script, txTo, inIdx, hashtype, amount):
+
+    hashPrevouts = 0
+    hashSequence = 0
+    hashOutputs = 0
+
+    if not (hashtype & SIGHASH_ANYONECANPAY):
+        serialize_prevouts = bytes()
+        for i in txTo.vin:
+            serialize_prevouts += i.prevout.serialize()
+        hashPrevouts = uint256_from_str(hash256(serialize_prevouts))
+
+    if (not (hashtype & SIGHASH_ANYONECANPAY) and (hashtype & 0x1f) != SIGHASH_SINGLE and (hashtype & 0x1f) != SIGHASH_NONE):
+        serialize_sequence = bytes()
+        for i in txTo.vin:
+            serialize_sequence += struct.pack("<I", i.nSequence)
+        hashSequence = uint256_from_str(hash256(serialize_sequence))
+
+    if ((hashtype & 0x1f) != SIGHASH_SINGLE and (hashtype & 0x1f) != SIGHASH_NONE):
+        serialize_outputs = bytes()
+        for o in txTo.vout:
+            serialize_outputs += o.serialize()
+        hashOutputs = uint256_from_str(hash256(serialize_outputs))
+    elif ((hashtype & 0x1f) == SIGHASH_SINGLE and inIdx < len(txTo.vout)):
+        serialize_outputs = txTo.vout[inIdx].serialize()
+        hashOutputs = uint256_from_str(hash256(serialize_outputs))
+
+    ss = bytes()
+    ss += struct.pack("<i", txTo.nVersion)
+    ss += ser_uint256(hashPrevouts)
+    ss += ser_uint256(hashSequence)
+    ss += txTo.vin[inIdx].prevout.serialize()
+    ss += ser_string(script)
+    ss += struct.pack("<q", amount)
+    ss += struct.pack("<I", txTo.vin[inIdx].nSequence)
+    ss += ser_uint256(hashOutputs)
+    ss += struct.pack("<i", txTo.nLockTime)
+    ss += struct.pack("<I", hashtype)
+
+    return hash256(ss)

basicswap/interface/contrib/firo_test_framework/siphash.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# siphash.py - Specialized SipHash-2-4 implementations
+#
+# This implements SipHash-2-4 for 256-bit integers.
+
+def rotl64(n, b):
+    return n >> (64 - b) | (n & ((1 << (64 - b)) - 1)) << b
+
+def siphash_round(v0, v1, v2, v3):
+    v0 = (v0 + v1) & ((1 << 64) - 1)
+    v1 = rotl64(v1, 13)
+    v1 ^= v0
+    v0 = rotl64(v0, 32)
+    v2 = (v2 + v3) & ((1 << 64) - 1)
+    v3 = rotl64(v3, 16)
+    v3 ^= v2
+    v0 = (v0 + v3) & ((1 << 64) - 1)
+    v3 = rotl64(v3, 21)
+    v3 ^= v0
+    v2 = (v2 + v1) & ((1 << 64) - 1)
+    v1 = rotl64(v1, 17)
+    v1 ^= v2
+    v2 = rotl64(v2, 32)
+    return (v0, v1, v2, v3)
+
+def siphash256(k0, k1, h):
+    n0 = h & ((1 << 64) - 1)
+    n1 = (h >> 64) & ((1 << 64) - 1)
+    n2 = (h >> 128) & ((1 << 64) - 1)
+    n3 = (h >> 192) & ((1 << 64) - 1)
+    v0 = 0x736f6d6570736575 ^ k0
+    v1 = 0x646f72616e646f6d ^ k1
+    v2 = 0x6c7967656e657261 ^ k0
+    v3 = 0x7465646279746573 ^ k1 ^ n0
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n0
+    v3 ^= n1
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n1
+    v3 ^= n2
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n2
+    v3 ^= n3
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n3
+    v3 ^= 0x2000000000000000
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= 0x2000000000000000
+    v2 ^= 0xFF
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    return v0 ^ v1 ^ v2 ^ v3

basicswap/interface/contrib/firo_test_framework/util.py

@@ -0,0 +1,841 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Copyright (c) 2014-2017 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+
+#
+# Helpful routines for regression testing
+#
+
+import os
+import sys
+
+from binascii import hexlify, unhexlify
+from base64 import b64encode
+from decimal import Decimal, ROUND_DOWN
+import json
+import http.client
+import random
+import shutil
+import subprocess
+import tempfile
+import time
+import re
+import errno
+import logging
+
+from . import coverage
+from .authproxy import AuthServiceProxy, JSONRPCException
+
+COVERAGE_DIR = None
+
+logger = logging.getLogger("TestFramework.utils")
+# The maximum number of nodes a single test can spawn
+MAX_NODES = 15
+# Don't assign rpc or p2p ports lower than this
+PORT_MIN = 11000
+# The number of ports to "reserve" for p2p and rpc, each
+PORT_RANGE = 5000
+
+BITCOIND_PROC_WAIT_TIMEOUT = 60
+
+
+class PortSeed:
+    # Must be initialized with a unique integer for each process
+    n = None
+
+#Set Mocktime default to OFF.
+#MOCKTIME is only needed for scripts that use the
+#cached version of the blockchain.  If the cached
+#version of the blockchain is used without MOCKTIME
+#then the mempools will not sync due to IBD.
+MOCKTIME = 0
+
+def enable_mocktime():
+    #For backwared compatibility of the python scripts
+    #with previous versions of the cache, set MOCKTIME
+    #to Jan 1, 2014 + (201 * 10 * 60)
+    global MOCKTIME
+    MOCKTIME = 1414776313 + (201 * 10 * 60)
+
+def set_mocktime(t):
+    global MOCKTIME
+    MOCKTIME = t
+
+def disable_mocktime():
+    global MOCKTIME
+    MOCKTIME = 0
+
+def get_mocktime():
+    return MOCKTIME
+
+def enable_coverage(dirname):
+    """Maintain a log of which RPC calls are made during testing."""
+    global COVERAGE_DIR
+    COVERAGE_DIR = dirname
+
+
+def get_rpc_proxy(url, node_number, timeout=None):
+    """
+    Args:
+        url (str): URL of the RPC server to call
+        node_number (int): the node number (or id) that this calls to
+
+    Kwargs:
+        timeout (int): HTTP timeout in seconds
+
+    Returns:
+        AuthServiceProxy. convenience object for making RPC calls.
+
+    """
+    proxy_kwargs = {}
+    if timeout is not None:
+        proxy_kwargs['timeout'] = timeout
+
+    proxy = AuthServiceProxy(url, **proxy_kwargs)
+    proxy.url = url  # store URL on proxy for info
+
+    coverage_logfile = coverage.get_filename(
+        COVERAGE_DIR, node_number) if COVERAGE_DIR else None
+
+    return coverage.AuthServiceProxyWrapper(proxy, coverage_logfile)
+
+def get_evoznsync_status(node):
+    result = node.evoznsync("status")
+    return result['IsSynced']
+
+def wait_to_sync(node, fast_znsync=False):
+    tm = 0
+    synced = False
+    while tm < 30:
+        synced = get_evoznsync_status(node)
+        if synced:
+            return
+        time.sleep(0.2)
+        if fast_znsync:
+            # skip mnsync states
+            node.evoznsync("next")
+        tm += 0.2
+    assert(synced)
+
+def p2p_port(n):
+    assert(n <= MAX_NODES)
+    return PORT_MIN + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
+
+def rpc_port(n):
+    return PORT_MIN + PORT_RANGE + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
+
+def check_json_precision():
+    """Make sure json library being used does not lose precision converting BTC values"""
+    n = Decimal("20000000.00000003")
+    satoshis = int(json.loads(json.dumps(float(n)))*1.0e8)
+    if satoshis != 2000000000000003:
+        raise RuntimeError("JSON encode/decode loses precision")
+
+def count_bytes(hex_string):
+    return len(bytearray.fromhex(hex_string))
+
+def bytes_to_hex_str(byte_str):
+    return hexlify(byte_str).decode('ascii')
+
+def hex_str_to_bytes(hex_str):
+    return unhexlify(hex_str.encode('ascii'))
+
+def str_to_b64str(string):
+    return b64encode(string.encode('utf-8')).decode('ascii')
+
+def sync_blocks(rpc_connections, *, wait=1, timeout=60):
+    """
+    Wait until everybody has the same tip.
+
+    sync_blocks needs to be called with an rpc_connections set that has least
+    one node already synced to the latest, stable tip, otherwise there's a
+    chance it might return before all nodes are stably synced.
+    """
+    # Use getblockcount() instead of waitforblockheight() to determine the
+    # initial max height because the two RPCs look at different internal global
+    # variables (chainActive vs latestBlock) and the former gets updated
+    # earlier.
+    maxheight = max(x.getblockcount() for x in rpc_connections)
+    start_time = cur_time = time.time()
+    while cur_time <= start_time + timeout:
+        tips = [r.waitforblockheight(maxheight, int(wait * 1000)) for r in rpc_connections]
+        if all(t["height"] == maxheight for t in tips):
+            if all(t["hash"] == tips[0]["hash"] for t in tips):
+                return
+            raise AssertionError("Block sync failed, mismatched block hashes:{}".format(
+                                 "".join("\n  {!r}".format(tip) for tip in tips)))
+
+        time.sleep(wait)
+        cur_time = time.time()
+    raise AssertionError("Block sync to height {} timed out:{}".format(
+                         maxheight, "".join("\n  {!r}".format(tip) for tip in tips)))
+
+def sync_znodes(rpc_connections, *, timeout=60):
+    """
+    Waits until every node has their znsync status is synced.
+    """
+    start_time = cur_time = time.time()
+    while cur_time <= start_time + timeout:
+        statuses = [r.znsync("status") for r in rpc_connections]
+        if all(stat["IsSynced"] == True for stat in statuses):
+            return
+        cur_time = time.time()
+    raise AssertionError("Znode sync failed.")
+
+def sync_chain(rpc_connections, *, wait=1, timeout=60):
+    """
+    Wait until everybody has the same best block
+    """
+    while timeout > 0:
+        best_hash = [x.getbestblockhash() for x in rpc_connections]
+        if best_hash == [best_hash[0]]*len(best_hash):
+            return
+        time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Chain sync failed: Best block hashes don't match")
+
+def sync_mempools(rpc_connections, *, wait=1, timeout=60):
+    """
+    Wait until everybody has the same transactions in their memory
+    pools
+    """
+    while timeout > 0:
+        pool = set(rpc_connections[0].getrawmempool())
+        num_match = 1
+        for i in range(1, len(rpc_connections)):
+            if set(rpc_connections[i].getrawmempool()) == pool:
+                num_match = num_match+1
+        if num_match == len(rpc_connections):
+            return
+        time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Mempool sync failed")
+
+def sync_znodes(rpc_connections, fast_mnsync=False):
+    for node in rpc_connections:
+        wait_to_sync(node, fast_mnsync)
+
+bitcoind_processes = {}
+
+def initialize_datadir(dirname, n):
+    datadir = os.path.join(dirname, "node"+str(n))
+    if not os.path.isdir(datadir):
+        os.makedirs(datadir)
+    rpc_u, rpc_p = rpc_auth_pair(n)
+    with open(os.path.join(datadir, "firo.conf"), 'w', encoding='utf8') as f:
+        f.write("regtest=1\n")
+        f.write("rpcuser=" + rpc_u + "\n")
+        f.write("rpcpassword=" + rpc_p + "\n")
+        f.write("port="+str(p2p_port(n))+"\n")
+        f.write("rpcport="+str(rpc_port(n))+"\n")
+        f.write("listenonion=0\n")
+    return datadir
+
+def rpc_auth_pair(n):
+    return 'rpcuser💻' + str(n), 'rpcpass🔑' + str(n)
+
+def rpc_url(i, rpchost=None):
+    rpc_u, rpc_p = rpc_auth_pair(i)
+    host = '127.0.0.1'
+    port = rpc_port(i)
+    if rpchost:
+        parts = rpchost.split(':')
+        if len(parts) == 2:
+            host, port = parts
+        else:
+            host = rpchost
+    return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, host, int(port))
+
+def wait_for_bitcoind_start(process, url, i):
+    '''
+    Wait for firod to start. This means that RPC is accessible and fully initialized.
+    Raise an exception if firod exits during initialization.
+    '''
+    while True:
+        if process.poll() is not None:
+            raise Exception('firod exited with status %i during initialization' % process.returncode)
+        try:
+            rpc = get_rpc_proxy(url, i)
+            blocks = rpc.getblockcount()
+            break # break out of loop on success
+        except IOError as e:
+            if e.errno != errno.ECONNREFUSED: # Port not yet open?
+                raise # unknown IO error
+        except JSONRPCException as e: # Initialization phase
+            if e.error['code'] != -28: # RPC in warmup?
+                raise # unknown JSON RPC exception
+        time.sleep(0.25)
+
+def initialize_chain(test_dir, num_nodes, cachedir):
+    """
+    Create a cache of a 200-block-long chain (with wallet) for MAX_NODES
+    Afterward, create num_nodes copies from the cache
+    """
+
+    assert num_nodes <= MAX_NODES
+    create_cache = False
+    for i in range(MAX_NODES):
+        if not os.path.isdir(os.path.join(cachedir, 'node'+str(i))):
+            create_cache = True
+            break
+
+    if create_cache:
+
+        #find and delete old cache directories if any exist
+        for i in range(MAX_NODES):
+            if os.path.isdir(os.path.join(cachedir,"node"+str(i))):
+                shutil.rmtree(os.path.join(cachedir,"node"+str(i)))
+
+        # Create cache directories, run bitcoinds:
+        for i in range(MAX_NODES):
+            datadir=initialize_datadir(cachedir, i)
+            args = [ os.getenv("FIROD", "firod"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
+            if i > 0:
+                args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
+            bitcoind_processes[i] = subprocess.Popen(args)
+            if os.getenv("PYTHON_DEBUG", ""):
+                print("initialize_chain: bitcoind started, waiting for RPC to come up")
+            wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
+            if os.getenv("PYTHON_DEBUG", ""):
+                print("initialize_chain: RPC successfully started")
+
+        rpcs = []
+        for i in range(MAX_NODES):
+            try:
+                rpcs.append(get_rpc_proxy(rpc_url(i), i))
+            except:
+                sys.stderr.write("Error connecting to "+url+"\n")
+                sys.exit(1)
+
+        # Create a 200-block-long chain; each of the 4 first nodes
+        # gets 25 mature blocks and 25 immature.
+        # Note: To preserve compatibility with older versions of
+        # initialize_chain, only 4 nodes will generate coins.
+        #
+        # blocks are created with timestamps 10 minutes apart
+        # starting from 2010 minutes in the past
+        enable_mocktime()
+        block_time = get_mocktime() - (201 * 10 * 60)
+        for i in range(2):
+            for peer in range(4):
+                for j in range(25):
+                    set_node_times(rpcs, block_time)
+                    rpcs[peer].generate(1)
+                    block_time += 10*60
+                # Must sync before next peer starts generating blocks
+                sync_blocks(rpcs)
+
+        # Shut them down, and clean up cache directories:
+        stop_nodes(rpcs)
+        disable_mocktime()
+        for i in range(MAX_NODES):
+            try:
+                os.remove(log_filename(cachedir, i, "debug.log"))
+                os.remove(log_filename(cachedir, i, "db.log"))
+                os.remove(log_filename(cachedir, i, "peers.dat"))
+                os.remove(log_filename(cachedir, i, "fee_estimates.dat"))
+            except OSError:
+                pass
+
+    for i in range(num_nodes):
+        from_dir = os.path.join(cachedir, "node"+str(i))
+        to_dir = os.path.join(test_dir,  "node"+str(i))
+        if from_dir != to_dir:
+            shutil.copytree(from_dir, to_dir)
+        initialize_datadir(test_dir, i) # Overwrite port/rpcport in bitcoin.conf
+
+def initialize_chain_clean(test_dir, num_nodes):
+    """
+    Create an empty blockchain and num_nodes wallets.
+    Useful if a test case wants complete control over initialization.
+    """
+    for i in range(num_nodes):
+        datadir=initialize_datadir(test_dir, i)
+
+
+def _rpchost_to_args(rpchost):
+    '''Convert optional IP:port spec to rpcconnect/rpcport args'''
+    if rpchost is None:
+        return []
+
+    match = re.match('(\[[0-9a-fA-f:]+\]|[^:]+)(?::([0-9]+))?$', rpchost)
+    if not match:
+        raise ValueError('Invalid RPC host spec ' + rpchost)
+
+    rpcconnect = match.group(1)
+    rpcport = match.group(2)
+
+    if rpcconnect.startswith('['): # remove IPv6 [...] wrapping
+        rpcconnect = rpcconnect[1:-1]
+
+    rv = ['-rpcconnect=' + rpcconnect]
+    if rpcport:
+        rv += ['-rpcport=' + rpcport]
+    return rv
+
+def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=None, redirect_stderr=False, stderr=None):
+    """
+    Start a bitcoind and return RPC connection to it
+    """
+    datadir = os.path.join(dirname, "node"+str(i))
+    if binary is None:
+        binary = os.getenv("FIROD", "firod")
+    args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-dandelion=0", "-usemnemonic=0", "-mocktime="+str(get_mocktime()) ]
+#Useful args for debugging
+#        "screen", "--",
+#        "gdb", "-x", "/tmp/gdb_run", "--args",
+
+# Don't try auto backups (they fail a lot when running tests)
+    args += [ "-createwalletbackups=0" ]
+    if extra_args is not None: args.extend(extra_args)
+    # Allow to redirect stderr to stdout in case we expect some non-critical warnings/errors printed to stderr
+    # Otherwise the whole test would be considered to be failed in such cases
+    if redirect_stderr:
+        stderr = sys.stdout
+    bitcoind_processes[i] = subprocess.Popen(args, stderr=stderr)
+    logger.debug("start_node: firod started, waiting for RPC to come up")
+    url = rpc_url(i, rpchost)
+    wait_for_bitcoind_start(bitcoind_processes[i], url, i)
+    logger.debug("start_node: RPC successfully started")
+    proxy = get_rpc_proxy(url, i, timeout=timewait)
+
+    if COVERAGE_DIR:
+        coverage.write_all_rpc_commands(COVERAGE_DIR, proxy)
+
+    return proxy
+
+def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, timewait=None, binary=None):
+    """
+    Start multiple bitcoinds, return RPC connections to them
+    """
+    if extra_args is None: extra_args = [ None for _ in range(num_nodes) ]
+    if binary is None: binary = [ None for _ in range(num_nodes) ]
+    rpcs = []
+    try:
+        for i in range(num_nodes):
+            rpcs.append(start_node(i, dirname, extra_args[i], rpchost, timewait=timewait, binary=binary[i]))
+    except: # If one node failed to start, stop the others
+        stop_nodes(rpcs)
+        raise
+    return rpcs
+
+def copy_datadir(from_node, to_node, dirname):
+    from_datadir = os.path.join(dirname, "node"+str(from_node), "regtest")
+    to_datadir = os.path.join(dirname, "node"+str(to_node), "regtest")
+
+    dirs = ["blocks", "chainstate", "evodb", "llmq"]
+    for d in dirs:
+        try:
+            src = os.path.join(from_datadir, d)
+            dst = os.path.join(to_datadir, d)
+            shutil.copytree(src, dst)
+        except:
+            pass
+def log_filename(dirname, n_node, logname):
+    return os.path.join(dirname, "node"+str(n_node), "regtest", logname)
+
+def wait_node(i):
+    return_code = bitcoind_processes[i].wait(timeout=BITCOIND_PROC_WAIT_TIMEOUT)
+    assert_equal(return_code, 0)
+    del bitcoind_processes[i]
+
+def stop_node(node, i, wait=True):
+    logger.debug("Stopping node %d" % i)
+    try:
+        node.stop()
+    except http.client.CannotSendRequest as e:
+        logger.exception("Unable to stop node")
+    if wait:
+        wait_node(i)
+
+def stop_nodes(nodes, fast=True):
+    for i, node in enumerate(nodes):
+        stop_node(node, i, not fast)
+    if fast:
+        for i, node in enumerate(nodes):
+            wait_node(i)
+    assert not bitcoind_processes.values() # All connections must be gone now
+
+def set_node_times(nodes, t):
+    for node in nodes:
+        node.setmocktime(t)
+
+def connect_nodes(from_connection, node_num):
+    # NOTE: In next line p2p_port(0) was replaced by rpc_port(0).
+    ip_port = "127.0.0.1:"+str(p2p_port(node_num))
+    from_connection.addnode(ip_port, "onetry")
+    # poll until version handshake complete to avoid race conditions
+    # with transaction relaying
+    while any(peer['version'] == 0 for peer in from_connection.getpeerinfo()):
+        time.sleep(0.1)
+
+def connect_nodes_bi(nodes, a, b):
+    connect_nodes(nodes[a], b)
+    connect_nodes(nodes[b], a)
+
+def isolate_node(node, timeout=5):
+    node.setnetworkactive(False)
+    st = time.time()
+    while time.time() < st + timeout:
+        if node.getconnectioncount() == 0:
+            return
+        time.sleep(0.5)
+    raise AssertionError("disconnect_node timed out")
+
+def reconnect_isolated_node(node, node_num):
+    node.setnetworkactive(True)
+    connect_nodes(node, node_num)
+def find_output(node, txid, amount):
+    """
+    Return index to output of txid with value amount
+    Raises exception if there is none.
+    """
+    txdata = node.getrawtransaction(txid, 1)
+    for i in range(len(txdata["vout"])):
+        if txdata["vout"][i]["value"] == amount:
+            return i
+    raise RuntimeError("find_output txid %s : %s not found"%(txid,str(amount)))
+
+
+def gather_inputs(from_node, amount_needed, confirmations_required=1):
+    """
+    Return a random set of unspent txouts that are enough to pay amount_needed
+    """
+    assert(confirmations_required >=0)
+    utxo = from_node.listunspent(confirmations_required)
+    random.shuffle(utxo)
+    inputs = []
+    total_in = Decimal("0.00000000")
+    while total_in < amount_needed and len(utxo) > 0:
+        t = utxo.pop()
+        total_in += t["amount"]
+        inputs.append({ "txid" : t["txid"], "vout" : t["vout"], "address" : t["address"] } )
+    if total_in < amount_needed:
+        raise RuntimeError("Insufficient funds: need %d, have %d"%(amount_needed, total_in))
+    return (total_in, inputs)
+
+def make_change(from_node, amount_in, amount_out, fee):
+    """
+    Create change output(s), return them
+    """
+    outputs = {}
+    amount = amount_out+fee
+    change = amount_in - amount
+    if change > amount*2:
+        # Create an extra change output to break up big inputs
+        change_address = from_node.getnewaddress()
+        # Split change in two, being careful of rounding:
+        outputs[change_address] = Decimal(change/2).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
+        change = amount_in - amount - outputs[change_address]
+    if change > 0:
+        outputs[from_node.getnewaddress()] = change
+    return outputs
+
+def send_zeropri_transaction(from_node, to_node, amount, fee):
+    """
+    Create&broadcast a zero-priority transaction.
+    Returns (txid, hex-encoded-txdata)
+    Ensures transaction is zero-priority by first creating a send-to-self,
+    then using its output
+    """
+
+    # Create a send-to-self with confirmed inputs:
+    self_address = from_node.getnewaddress()
+    (total_in, inputs) = gather_inputs(from_node, amount+fee*2)
+    outputs = make_change(from_node, total_in, amount+fee, fee)
+    outputs[self_address] = float(amount+fee)
+
+    self_rawtx = from_node.createrawtransaction(inputs, outputs)
+    self_signresult = from_node.signrawtransaction(self_rawtx)
+    self_txid = from_node.sendrawtransaction(self_signresult["hex"], True)
+
+    vout = find_output(from_node, self_txid, amount+fee)
+    # Now immediately spend the output to create a 1-input, 1-output
+    # zero-priority transaction:
+    inputs = [ { "txid" : self_txid, "vout" : vout } ]
+    outputs = { to_node.getnewaddress() : float(amount) }
+
+    rawtx = from_node.createrawtransaction(inputs, outputs)
+    signresult = from_node.signrawtransaction(rawtx)
+    txid = from_node.sendrawtransaction(signresult["hex"], True)
+
+    return (txid, signresult["hex"])
+
+def random_zeropri_transaction(nodes, amount, min_fee, fee_increment, fee_variants):
+    """
+    Create a random zero-priority transaction.
+    Returns (txid, hex-encoded-transaction-data, fee)
+    """
+    from_node = random.choice(nodes)
+    to_node = random.choice(nodes)
+    fee = min_fee + fee_increment*random.randint(0,fee_variants)
+    (txid, txhex) = send_zeropri_transaction(from_node, to_node, amount, fee)
+    return (txid, txhex, fee)
+
+def random_transaction(nodes, amount, min_fee, fee_increment, fee_variants):
+    """
+    Create a random transaction.
+    Returns (txid, hex-encoded-transaction-data, fee)
+    """
+    from_node = random.choice(nodes)
+    to_node = random.choice(nodes)
+    fee = min_fee + fee_increment*random.randint(0,fee_variants)
+
+    (total_in, inputs) = gather_inputs(from_node, amount+fee)
+    outputs = make_change(from_node, total_in, amount, fee)
+    outputs[to_node.getnewaddress()] = float(amount)
+
+    rawtx = from_node.createrawtransaction(inputs, outputs)
+    signresult = from_node.signrawtransaction(rawtx)
+    txid = from_node.sendrawtransaction(signresult["hex"], True)
+
+    return (txid, signresult["hex"], fee)
+
+def assert_fee_amount(fee, tx_size, fee_per_kB):
+    """Assert the fee was in range"""
+    target_fee = tx_size * fee_per_kB / 1000
+    if fee < target_fee:
+        raise AssertionError("Fee of %s BTC too low! (Should be %s BTC)"%(str(fee), str(target_fee)))
+    # allow the wallet's estimation to be at most 2 bytes off
+    if fee > (tx_size + 2) * fee_per_kB / 1000:
+        raise AssertionError("Fee of %s BTC too high! (Should be %s BTC)"%(str(fee), str(target_fee)))
+
+def assert_equal(thing1, thing2, *args):
+    if thing1 != thing2 or any(thing1 != arg for arg in args):
+        raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
+
+def assert_greater_than(thing1, thing2):
+    if thing1 <= thing2:
+        raise AssertionError("%s <= %s"%(str(thing1),str(thing2)))
+
+def assert_greater_than_or_equal(thing1, thing2):
+    if thing1 < thing2:
+        raise AssertionError("%s < %s"%(str(thing1),str(thing2)))
+
+def assert_raises(exc, fun, *args, **kwds):
+    assert_raises_message(exc, None, fun, *args, **kwds)
+
+def assert_raises_message(exc, message, fun, *args, **kwds):
+    try:
+        fun(*args, **kwds)
+    except exc as e:
+        if message is not None and message not in e.error['message']:
+            raise AssertionError("Expected substring not found:"+e.error['message'])
+    except Exception as e:
+        raise AssertionError("Unexpected exception raised: "+type(e).__name__)
+    else:
+        raise AssertionError("No exception raised")
+
+def assert_raises_jsonrpc(code, message, fun, *args, **kwds):
+    """Run an RPC and verify that a specific JSONRPC exception code and message is raised.
+
+    Calls function `fun` with arguments `args` and `kwds`. Catches a JSONRPCException
+    and verifies that the error code and message are as expected. Throws AssertionError if
+    no JSONRPCException was returned or if the error code/message are not as expected.
+
+    Args:
+        code (int), optional: the error code returned by the RPC call (defined
+            in src/rpc/protocol.h). Set to None if checking the error code is not required.
+        message (string), optional: [a substring of] the error string returned by the
+            RPC call. Set to None if checking the error string is not required
+        fun (function): the function to call. This should be the name of an RPC.
+        args*: positional arguments for the function.
+        kwds**: named arguments for the function.
+    """
+    try:
+        fun(*args, **kwds)
+    except JSONRPCException as e:
+        # JSONRPCException was thrown as expected. Check the code and message values are correct.
+        if (code is not None) and (code != e.error["code"]):
+            raise AssertionError("Unexpected JSONRPC error code %i" % e.error["code"])
+        if (message is not None) and (message not in e.error['message']):
+            raise AssertionError("Expected substring not found:"+e.error['message'])
+    except Exception as e:
+        raise AssertionError("Unexpected exception raised: "+type(e).__name__)
+    else:
+        raise AssertionError("No exception raised")
+
+def assert_is_hex_string(string):
+    try:
+        int(string, 16)
+    except Exception as e:
+        raise AssertionError(
+            "Couldn't interpret %r as hexadecimal; raised: %s" % (string, e))
+
+def assert_is_hash_string(string, length=64):
+    if not isinstance(string, str):
+        raise AssertionError("Expected a string, got type %r" % type(string))
+    elif length and len(string) != length:
+        raise AssertionError(
+            "String of length %d expected; got %d" % (length, len(string)))
+    elif not re.match('[abcdef0-9]+$', string):
+        raise AssertionError(
+            "String %r contains invalid characters for a hash." % string)
+
+def assert_array_result(object_array, to_match, expected, should_not_find = False):
+    """
+        Pass in array of JSON objects, a dictionary with key/value pairs
+        to match against, and another dictionary with expected key/value
+        pairs.
+        If the should_not_find flag is true, to_match should not be found
+        in object_array
+        """
+    if should_not_find == True:
+        assert_equal(expected, { })
+    num_matched = 0
+    for item in object_array:
+        all_match = True
+        for key,value in to_match.items():
+            if item[key] != value:
+                all_match = False
+        if not all_match:
+            continue
+        elif should_not_find == True:
+            num_matched = num_matched+1
+        for key,value in expected.items():
+            if item[key] != value:
+                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
+            num_matched = num_matched+1
+    if num_matched == 0 and should_not_find != True:
+        raise AssertionError("No objects matched %s"%(str(to_match)))
+    if num_matched > 0 and should_not_find == True:
+        raise AssertionError("Objects were found %s"%(str(to_match)))
+
+def satoshi_round(amount):
+    return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
+
+# Helper to create at least "count" utxos
+# Pass in a fee that is sufficient for relay and mining new transactions.
+def create_confirmed_utxos(fee, node, count):
+    node.generate(int(0.5*count)+101)
+    utxos = node.listunspent()
+    iterations = count - len(utxos)
+    addr1 = node.getnewaddress()
+    addr2 = node.getnewaddress()
+    if iterations <= 0:
+        return utxos
+    for i in range(iterations):
+        t = utxos.pop()
+        inputs = []
+        inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
+        outputs = {}
+        send_value = t['amount'] - fee
+        outputs[addr1] = satoshi_round(send_value/2)
+        outputs[addr2] = satoshi_round(send_value/2)
+        raw_tx = node.createrawtransaction(inputs, outputs)
+        signed_tx = node.signrawtransaction(raw_tx)["hex"]
+        txid = node.sendrawtransaction(signed_tx)
+
+    while (node.getmempoolinfo()['size'] > 0):
+        node.generate(1)
+
+    utxos = node.listunspent()
+    assert(len(utxos) >= count)
+    return utxos
+
+# Create large OP_RETURN txouts that can be appended to a transaction
+# to make it large (helper for constructing large transactions).
+def gen_return_txouts():
+    # Some pre-processing to create a bunch of OP_RETURN txouts to insert into transactions we create
+    # So we have big transactions (and therefore can't fit very many into each block)
+    # create one script_pubkey
+    script_pubkey = "6a4d0200" #OP_RETURN OP_PUSH2 512 bytes
+    for i in range (512):
+        script_pubkey = script_pubkey + "01"
+    # concatenate 128 txouts of above script_pubkey which we'll insert before the txout for change
+    txouts = "81"
+    for k in range(128):
+        # add txout value
+        txouts = txouts + "0000000000000000"
+        # add length of script_pubkey
+        txouts = txouts + "fd0402"
+        # add script_pubkey
+        txouts = txouts + script_pubkey
+    return txouts
+
+def create_tx(node, coinbase, to_address, amount):
+    inputs = [{ "txid" : coinbase, "vout" : 0}]
+    outputs = { to_address : amount }
+    rawtx = node.createrawtransaction(inputs, outputs)
+    signresult = node.signrawtransaction(rawtx)
+    assert_equal(signresult["complete"], True)
+    return signresult["hex"]
+
+def create_tx_multi_input(node, inputs, outputs):
+    rawtx = node.createrawtransaction(inputs, outputs)
+    signresult = node.signrawtransaction(rawtx)
+    assert_equal(signresult["complete"], True)
+    return signresult["hex"]
+
+# Create a spend of each passed-in utxo, splicing in "txouts" to each raw
+# transaction to make it large.  See gen_return_txouts() above.
+def create_lots_of_big_transactions(node, txouts, utxos, num, fee):
+    addr = node.getnewaddress()
+    txids = []
+    for _ in range(num):
+        t = utxos.pop()
+        inputs=[{ "txid" : t["txid"], "vout" : t["vout"]}]
+        outputs = {}
+        change = t['amount'] - fee
+        outputs[addr] = satoshi_round(change)
+        rawtx = node.createrawtransaction(inputs, outputs)
+        newtx = rawtx[0:92]
+        newtx = newtx + txouts
+        newtx = newtx + rawtx[94:]
+        signresult = node.signrawtransaction(newtx, None, None, "NONE")
+        txid = node.sendrawtransaction(signresult["hex"], True)
+        txids.append(txid)
+    return txids
+
+def mine_large_block(node, utxos=None):
+    # generate a 66k transaction,
+    # and 14 of them is close to the 1MB block limit
+    num = 14
+    txouts = gen_return_txouts()
+    utxos = utxos if utxos is not None else []
+    if len(utxos) < num:
+        utxos.clear()
+        utxos.extend(node.listunspent())
+    fee = 100 * node.getnetworkinfo()["relayfee"]
+    create_lots_of_big_transactions(node, txouts, utxos, num, fee=fee)
+    node.generate(1)
+
+def get_bip9_status(node, key):
+    info = node.getblockchaininfo()
+    return info['bip9_softforks'][key]
+
+def dumpprivkey_otac(node, address):
+    import re
+    error_text = ''
+    try:
+        return node.dumpprivkey(address)
+    except JSONRPCException as e:
+        error_text = e.error
+    else:
+        raise
+
+    otac_match = re.search("Your one time authorization code is: ([a-zA-Z0-9]+)", error_text['message'])
+    if not otac_match:
+        raise JSONRPCException(error_text)
+    return node.dumpprivkey(address, otac_match.groups()[0])
+
+def get_znsync_status(node):
+    result = node.znsync("status")
+    return result['IsSynced']
+
+def wait_to_sync_znodes(node, fast_znsync=False):
+    while True:
+        synced = get_znsync_status(node)
+        if synced:
+            break
+        time.sleep(0.2)
+        if fast_znsync:
+            # skip mnsync states
+            node.znsync("next")
+
+def get_full_balance(node):
+    wallet_info = node.getwalletinfo()
+    return wallet_info["balance"] + wallet_info["immature_balance"] + wallet_info["unconfirmed_balance"]

basicswap/interface/contrib/nav_test_framework/authproxy.py

@@ -0,0 +1,175 @@
+
+"""
+  Copyright 2011 Jeff Garzik
+
+  AuthServiceProxy has the following improvements over python-jsonrpc's
+  ServiceProxy class:
+
+  - HTTP connections persist for the life of the AuthServiceProxy object
+    (if server supports HTTP/1.1)
+  - sends protocol 'version', per JSON-RPC 1.1
+  - sends proper, incrementing 'id'
+  - sends Basic HTTP authentication headers
+  - parses all JSON numbers that look like floats as Decimal
+  - uses standard Python json lib
+
+  Previous copyright, from python-jsonrpc/jsonrpc/proxy.py:
+
+  Copyright (c) 2007 Jan-Klaas Kollhof
+
+  This file is part of jsonrpc.
+
+  jsonrpc is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  This software is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this software; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+"""
+
+try:
+    import http.client as httplib
+except ImportError:
+    import httplib
+import base64
+import decimal
+import json
+import logging
+try:
+    import urllib.parse as urlparse
+except ImportError:
+    import urlparse
+
+USER_AGENT = "AuthServiceProxy/0.1"
+
+HTTP_TIMEOUT = 30
+
+log = logging.getLogger("NavcoinRPC")
+
+class JSONRPCException(Exception):
+    def __init__(self, rpc_error):
+        Exception.__init__(self)
+        self.error = rpc_error
+
+
+def EncodeDecimal(o):
+    if isinstance(o, decimal.Decimal):
+        return str(o)
+    raise TypeError(repr(o) + " is not JSON serializable")
+
+class AuthServiceProxy(object):
+    __id_count = 0
+
+    # ensure_ascii: escape unicode as \uXXXX, passed to json.dumps
+    def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connection=None, ensure_ascii=True):
+        self.__service_url = service_url
+        self._service_name = service_name
+        self.ensure_ascii = ensure_ascii # can be toggled on the fly by tests
+        self.__url = urlparse.urlparse(service_url)
+        if self.__url.port is None:
+            port = 80
+        else:
+            port = self.__url.port
+        (user, passwd) = (self.__url.username, self.__url.password)
+        try:
+            user = user.encode('utf8')
+        except AttributeError:
+            pass
+        try:
+            passwd = passwd.encode('utf8')
+        except AttributeError:
+            pass
+        authpair = user + b':' + passwd
+        self.__auth_header = b'Basic ' + base64.b64encode(authpair)
+
+        if connection:
+            # Callables re-use the connection of the original proxy
+            self.__conn = connection
+        elif self.__url.scheme == 'https':
+            self.__conn = httplib.HTTPSConnection(self.__url.hostname, port,
+                                                  timeout=timeout)
+        else:
+            self.__conn = httplib.HTTPConnection(self.__url.hostname, port,
+                                                 timeout=timeout)
+
+    def __getattr__(self, name):
+        if name.startswith('__') and name.endswith('__'):
+            # Python internal stuff
+            raise AttributeError
+        if self._service_name is not None:
+            name = "%s.%s" % (self._service_name, name)
+        return AuthServiceProxy(self.__service_url, name, connection=self.__conn)
+
+    def _request(self, method, path, postdata):
+        '''
+        Do a HTTP request, with retry if we get disconnected (e.g. due to a timeout).
+        This is a workaround for https://bugs.python.org/issue3566 which is fixed in Python 3.5.
+        '''
+        headers = {'Host': self.__url.hostname,
+                   'User-Agent': USER_AGENT,
+                   'Authorization': self.__auth_header,
+                   'Content-type': 'application/json'}
+        try:
+            self.__conn.request(method, path, postdata, headers)
+            return self._get_response()
+        except httplib.BadStatusLine as e:
+            if e.line == "''": # if connection was closed, try again
+                self.__conn.close()
+                self.__conn.request(method, path, postdata, headers)
+                return self._get_response()
+            else:
+                raise
+        except BrokenPipeError:
+            # Python 3.5+ raises this instead of BadStatusLine when the connection was reset
+            self.__conn.close()
+            self.__conn.request(method, path, postdata, headers)
+            return self._get_response()
+
+    def __call__(self, *args):
+        AuthServiceProxy.__id_count += 1
+
+        log.debug("-%s-> %s %s"%(AuthServiceProxy.__id_count, self._service_name,
+                                 json.dumps(args, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
+        postdata = json.dumps({'version': '1.1',
+                               'method': self._service_name,
+                               'params': args,
+                               'id': AuthServiceProxy.__id_count}, default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
+        response = self._request('POST', self.__url.path, postdata.encode('utf-8'))
+        if response['error'] is not None:
+            raise JSONRPCException(response['error'])
+        elif 'result' not in response:
+            raise JSONRPCException({
+                'code': -343, 'message': 'missing JSON-RPC result'})
+        else:
+            return response['result']
+
+    def _batch(self, rpc_call_list):
+        postdata = json.dumps(list(rpc_call_list), default=EncodeDecimal, ensure_ascii=self.ensure_ascii)
+        log.debug("--> "+postdata)
+        return self._request('POST', self.__url.path, postdata.encode('utf-8'))
+
+    def _get_response(self):
+        http_response = self.__conn.getresponse()
+        if http_response is None:
+            raise JSONRPCException({
+                'code': -342, 'message': 'missing HTTP response from server'})
+
+        content_type = http_response.getheader('Content-Type')
+        if content_type != 'application/json':
+            raise JSONRPCException({
+                'code': -342, 'message': 'non-JSON HTTP response with \'%i %s\' from server' % (http_response.status, http_response.reason)})
+
+        responsedata = http_response.read().decode('utf8')
+        response = json.loads(responsedata, parse_float=decimal.Decimal)
+        if "error" in response and response["error"] is None:
+            log.debug("<-%s- %s"%(response["id"], json.dumps(response["result"], default=EncodeDecimal, ensure_ascii=self.ensure_ascii)))
+        else:
+            log.debug("<-- "+responsedata)
+        return response

basicswap/interface/contrib/nav_test_framework/bignum.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+#
+# bignum.py
+#
+# This file is copied from python-navcoinlib.
+#
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+
+"""Bignum routines"""
+
+
+import struct
+
+
+# generic big endian MPI format
+
+def bn_bytes(v, have_ext=False):
+    ext = 0
+    if have_ext:
+        ext = 1
+    return ((v.bit_length()+7)//8) + ext
+
+def bn2bin(v):
+    s = bytearray()
+    i = bn_bytes(v)
+    while i > 0:
+        s.append((v >> ((i-1) * 8)) & 0xff)
+        i -= 1
+    return s
+
+def bin2bn(s):
+    l = 0
+    for ch in s:
+        l = (l << 8) | ch
+    return l
+
+def bn2mpi(v):
+    have_ext = False
+    if v.bit_length() > 0:
+        have_ext = (v.bit_length() & 0x07) == 0
+
+    neg = False
+    if v < 0:
+        neg = True
+        v = -v
+
+    s = struct.pack(b">I", bn_bytes(v, have_ext))
+    ext = bytearray()
+    if have_ext:
+        ext.append(0)
+    v_bin = bn2bin(v)
+    if neg:
+        if have_ext:
+            ext[0] |= 0x80
+        else:
+            v_bin[0] |= 0x80
+    return s + ext + v_bin
+
+def mpi2bn(s):
+    if len(s) < 4:
+        return None
+    s_size = bytes(s[:4])
+    v_len = struct.unpack(b">I", s_size)[0]
+    if len(s) != (v_len + 4):
+        return None
+    if v_len == 0:
+        return 0
+
+    v_str = bytearray(s[4:])
+    neg = False
+    i = v_str[0]
+    if i & 0x80:
+        neg = True
+        i &= ~0x80
+        v_str[0] = i
+
+    v = bin2bn(v_str)
+
+    if neg:
+        return -v
+    return v
+
+# navcoin-specific little endian format, with implicit size
+def mpi2vch(s):
+    r = s[4:]           # strip size
+    r = r[::-1]         # reverse string, converting BE->LE
+    return r
+
+def bn2vch(v):
+    return bytes(mpi2vch(bn2mpi(v)))
+
+def vch2mpi(s):
+    r = struct.pack(b">I", len(s))   # size
+    r += s[::-1]            # reverse string, converting LE->BE
+    return r
+
+def vch2bn(s):
+    return mpi2bn(vch2mpi(s))
+

basicswap/interface/contrib/nav_test_framework/coverage.py

@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+"""
+This module contains utilities for doing coverage analysis on the RPC
+interface.
+
+It provides a way to track which RPC commands are exercised during
+testing.
+
+"""
+import os
+
+
+REFERENCE_FILENAME = 'rpc_interface.txt'
+
+
+class AuthServiceProxyWrapper(object):
+    """
+    An object that wraps AuthServiceProxy to record specific RPC calls.
+
+    """
+    def __init__(self, auth_service_proxy_instance, coverage_logfile=None):
+        """
+        Kwargs:
+            auth_service_proxy_instance (AuthServiceProxy): the instance
+                being wrapped.
+            coverage_logfile (str): if specified, write each service_name
+                out to a file when called.
+
+        """
+        self.auth_service_proxy_instance = auth_service_proxy_instance
+        self.coverage_logfile = coverage_logfile
+
+    def __getattr__(self, *args, **kwargs):
+        return_val = self.auth_service_proxy_instance.__getattr__(
+            *args, **kwargs)
+
+        return AuthServiceProxyWrapper(return_val, self.coverage_logfile)
+
+    def __call__(self, *args, **kwargs):
+        """
+        Delegates to AuthServiceProxy, then writes the particular RPC method
+        called to a file.
+
+        """
+        return_val = self.auth_service_proxy_instance.__call__(*args, **kwargs)
+        rpc_method = self.auth_service_proxy_instance._service_name
+
+        if self.coverage_logfile:
+            with open(self.coverage_logfile, 'a+') as f:
+                f.write("%s\n" % rpc_method)
+
+        return return_val
+
+    @property
+    def url(self):
+        return self.auth_service_proxy_instance.url
+
+
+def get_filename(dirname, n_node):
+    """
+    Get a filename unique to the test process ID and node.
+
+    This file will contain a list of RPC commands covered.
+    """
+    pid = str(os.getpid())
+    return os.path.join(
+        dirname, "coverage.pid%s.node%s.txt" % (pid, str(n_node)))
+
+
+def write_all_rpc_commands(dirname, node):
+    """
+    Write out a list of all RPC functions available in `navcoin-cli` for
+    coverage comparison. This will only happen once per coverage
+    directory.
+
+    Args:
+        dirname (str): temporary test dir
+        node (AuthServiceProxy): client
+
+    Returns:
+        bool. if the RPC interface file was written.
+
+    """
+    filename = os.path.join(dirname, REFERENCE_FILENAME)
+
+    if os.path.isfile(filename):
+        return False
+
+    help_output = node.help().split('\n')
+    commands = set()
+
+    for line in help_output:
+        line = line.strip()
+
+        # Ignore blanks and headers
+        if line and not line.startswith('='):
+            commands.add("%s\n" % line.split()[0])
+
+    with open(filename, 'w') as f:
+        f.writelines(list(commands))
+
+    return True

basicswap/interface/contrib/nav_test_framework/script.py

@@ -0,0 +1,943 @@
+#!/usr/bin/env python3
+# Copyright (c) 2015-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#
+# script.py
+#
+# This file is modified from python-navcoinlib.
+#
+
+"""Scripts
+
+Functionality to build scripts, as well as SignatureHash().
+"""
+
+
+from .mininode import CTransaction, CTxOut, sha256, hash256, uint256_from_str, ser_uint256, ser_string
+from binascii import hexlify
+import hashlib
+
+import sys
+bchr = chr
+bord = ord
+if sys.version > '3':
+    long = int
+    bchr = lambda x: bytes([x])
+    bord = lambda x: x
+
+import struct
+
+from .bignum import bn2vch
+
+MAX_SCRIPT_SIZE = 10000
+MAX_SCRIPT_ELEMENT_SIZE = 520
+MAX_SCRIPT_OPCODES = 201
+
+OPCODE_NAMES = {}
+
+_opcode_instances = []
+class CScriptOp(int):
+    """A single script opcode"""
+    __slots__ = []
+
+    @staticmethod
+    def encode_op_pushdata(d):
+        """Encode a PUSHDATA op, returning bytes"""
+        if len(d) < 0x4c:
+            return b'' + bchr(len(d)) + d # OP_PUSHDATA
+        elif len(d) <= 0xff:
+            return b'\x4c' + bchr(len(d)) + d # OP_PUSHDATA1
+        elif len(d) <= 0xffff:
+            return b'\x4d' + struct.pack(b'<H', len(d)) + d # OP_PUSHDATA2
+        elif len(d) <= 0xffffffff:
+            return b'\x4e' + struct.pack(b'<I', len(d)) + d # OP_PUSHDATA4
+        else:
+            raise ValueError("Data too long to encode in a PUSHDATA op")
+
+    @staticmethod
+    def encode_op_n(n):
+        """Encode a small integer op, returning an opcode"""
+        if not (0 <= n <= 16):
+            raise ValueError('Integer must be in range 0 <= n <= 16, got %d' % n)
+
+        if n == 0:
+            return OP_0
+        else:
+            return CScriptOp(OP_1 + n-1)
+
+    def decode_op_n(self):
+        """Decode a small integer opcode, returning an integer"""
+        if self == OP_0:
+            return 0
+
+        if not (self == OP_0 or OP_1 <= self <= OP_16):
+            raise ValueError('op %r is not an OP_N' % self)
+
+        return int(self - OP_1+1)
+
+    def is_small_int(self):
+        """Return true if the op pushes a small integer to the stack"""
+        if 0x51 <= self <= 0x60 or self == 0:
+            return True
+        else:
+            return False
+
+    def __str__(self):
+        return repr(self)
+
+    def __repr__(self):
+        if self in OPCODE_NAMES:
+            return OPCODE_NAMES[self]
+        else:
+            return 'CScriptOp(0x%x)' % self
+
+    def __new__(cls, n):
+        try:
+            return _opcode_instances[n]
+        except IndexError:
+            assert len(_opcode_instances) == n
+            _opcode_instances.append(super(CScriptOp, cls).__new__(cls, n))
+            return _opcode_instances[n]
+
+# Populate opcode instance table
+for n in range(0xff+1):
+    CScriptOp(n)
+
+
+# push value
+OP_0 = CScriptOp(0x00)
+OP_FALSE = OP_0
+OP_PUSHDATA1 = CScriptOp(0x4c)
+OP_PUSHDATA2 = CScriptOp(0x4d)
+OP_PUSHDATA4 = CScriptOp(0x4e)
+OP_1NEGATE = CScriptOp(0x4f)
+OP_RESERVED = CScriptOp(0x50)
+OP_1 = CScriptOp(0x51)
+OP_TRUE=OP_1
+OP_2 = CScriptOp(0x52)
+OP_3 = CScriptOp(0x53)
+OP_4 = CScriptOp(0x54)
+OP_5 = CScriptOp(0x55)
+OP_6 = CScriptOp(0x56)
+OP_7 = CScriptOp(0x57)
+OP_8 = CScriptOp(0x58)
+OP_9 = CScriptOp(0x59)
+OP_10 = CScriptOp(0x5a)
+OP_11 = CScriptOp(0x5b)
+OP_12 = CScriptOp(0x5c)
+OP_13 = CScriptOp(0x5d)
+OP_14 = CScriptOp(0x5e)
+OP_15 = CScriptOp(0x5f)
+OP_16 = CScriptOp(0x60)
+
+# control
+OP_NOP = CScriptOp(0x61)
+OP_VER = CScriptOp(0x62)
+OP_IF = CScriptOp(0x63)
+OP_NOTIF = CScriptOp(0x64)
+OP_VERIF = CScriptOp(0x65)
+OP_VERNOTIF = CScriptOp(0x66)
+OP_ELSE = CScriptOp(0x67)
+OP_ENDIF = CScriptOp(0x68)
+OP_VERIFY = CScriptOp(0x69)
+OP_RETURN = CScriptOp(0x6a)
+
+# stack ops
+OP_TOALTSTACK = CScriptOp(0x6b)
+OP_FROMALTSTACK = CScriptOp(0x6c)
+OP_2DROP = CScriptOp(0x6d)
+OP_2DUP = CScriptOp(0x6e)
+OP_3DUP = CScriptOp(0x6f)
+OP_2OVER = CScriptOp(0x70)
+OP_2ROT = CScriptOp(0x71)
+OP_2SWAP = CScriptOp(0x72)
+OP_IFDUP = CScriptOp(0x73)
+OP_DEPTH = CScriptOp(0x74)
+OP_DROP = CScriptOp(0x75)
+OP_DUP = CScriptOp(0x76)
+OP_NIP = CScriptOp(0x77)
+OP_OVER = CScriptOp(0x78)
+OP_PICK = CScriptOp(0x79)
+OP_ROLL = CScriptOp(0x7a)
+OP_ROT = CScriptOp(0x7b)
+OP_SWAP = CScriptOp(0x7c)
+OP_TUCK = CScriptOp(0x7d)
+
+# splice ops
+OP_CAT = CScriptOp(0x7e)
+OP_SUBSTR = CScriptOp(0x7f)
+OP_LEFT = CScriptOp(0x80)
+OP_RIGHT = CScriptOp(0x81)
+OP_SIZE = CScriptOp(0x82)
+
+# bit logic
+OP_INVERT = CScriptOp(0x83)
+OP_AND = CScriptOp(0x84)
+OP_OR = CScriptOp(0x85)
+OP_XOR = CScriptOp(0x86)
+OP_EQUAL = CScriptOp(0x87)
+OP_EQUALVERIFY = CScriptOp(0x88)
+OP_RESERVED1 = CScriptOp(0x89)
+OP_RESERVED2 = CScriptOp(0x8a)
+
+# numeric
+OP_1ADD = CScriptOp(0x8b)
+OP_1SUB = CScriptOp(0x8c)
+OP_2MUL = CScriptOp(0x8d)
+OP_2DIV = CScriptOp(0x8e)
+OP_NEGATE = CScriptOp(0x8f)
+OP_ABS = CScriptOp(0x90)
+OP_NOT = CScriptOp(0x91)
+OP_0NOTEQUAL = CScriptOp(0x92)
+
+OP_ADD = CScriptOp(0x93)
+OP_SUB = CScriptOp(0x94)
+OP_MUL = CScriptOp(0x95)
+OP_DIV = CScriptOp(0x96)
+OP_MOD = CScriptOp(0x97)
+OP_LSHIFT = CScriptOp(0x98)
+OP_RSHIFT = CScriptOp(0x99)
+
+OP_BOOLAND = CScriptOp(0x9a)
+OP_BOOLOR = CScriptOp(0x9b)
+OP_NUMEQUAL = CScriptOp(0x9c)
+OP_NUMEQUALVERIFY = CScriptOp(0x9d)
+OP_NUMNOTEQUAL = CScriptOp(0x9e)
+OP_LESSTHAN = CScriptOp(0x9f)
+OP_GREATERTHAN = CScriptOp(0xa0)
+OP_LESSTHANOREQUAL = CScriptOp(0xa1)
+OP_GREATERTHANOREQUAL = CScriptOp(0xa2)
+OP_MIN = CScriptOp(0xa3)
+OP_MAX = CScriptOp(0xa4)
+
+OP_WITHIN = CScriptOp(0xa5)
+
+# crypto
+OP_RIPEMD160 = CScriptOp(0xa6)
+OP_SHA1 = CScriptOp(0xa7)
+OP_SHA256 = CScriptOp(0xa8)
+OP_HASH160 = CScriptOp(0xa9)
+OP_HASH256 = CScriptOp(0xaa)
+OP_CODESEPARATOR = CScriptOp(0xab)
+OP_CHECKSIG = CScriptOp(0xac)
+OP_CHECKSIGVERIFY = CScriptOp(0xad)
+OP_CHECKMULTISIG = CScriptOp(0xae)
+OP_CHECKMULTISIGVERIFY = CScriptOp(0xaf)
+
+# expansion
+OP_NOP1 = CScriptOp(0xb0)
+OP_CHECKLOCKTIMEVERIFY = CScriptOp(0xb1)
+OP_CHECKSEQUENCEVERIFY = CScriptOp(0xb2)
+OP_NOP4 = CScriptOp(0xb3)
+OP_NOP5 = CScriptOp(0xb4)
+OP_NOP6 = CScriptOp(0xb5)
+OP_NOP7 = CScriptOp(0xb6)
+OP_NOP8 = CScriptOp(0xb7)
+OP_NOP9 = CScriptOp(0xb8)
+OP_NOP10 = CScriptOp(0xb9)
+
+# template matching params
+OP_SMALLINTEGER = CScriptOp(0xfa)
+OP_PUBKEYS = CScriptOp(0xfb)
+OP_PUBKEYHASH = CScriptOp(0xfd)
+OP_PUBKEY = CScriptOp(0xfe)
+
+OP_INVALIDOPCODE = CScriptOp(0xff)
+
+VALID_OPCODES = {
+    OP_1NEGATE,
+    OP_RESERVED,
+    OP_1,
+    OP_2,
+    OP_3,
+    OP_4,
+    OP_5,
+    OP_6,
+    OP_7,
+    OP_8,
+    OP_9,
+    OP_10,
+    OP_11,
+    OP_12,
+    OP_13,
+    OP_14,
+    OP_15,
+    OP_16,
+
+    OP_NOP,
+    OP_VER,
+    OP_IF,
+    OP_NOTIF,
+    OP_VERIF,
+    OP_VERNOTIF,
+    OP_ELSE,
+    OP_ENDIF,
+    OP_VERIFY,
+    OP_RETURN,
+
+    OP_TOALTSTACK,
+    OP_FROMALTSTACK,
+    OP_2DROP,
+    OP_2DUP,
+    OP_3DUP,
+    OP_2OVER,
+    OP_2ROT,
+    OP_2SWAP,
+    OP_IFDUP,
+    OP_DEPTH,
+    OP_DROP,
+    OP_DUP,
+    OP_NIP,
+    OP_OVER,
+    OP_PICK,
+    OP_ROLL,
+    OP_ROT,
+    OP_SWAP,
+    OP_TUCK,
+
+    OP_CAT,
+    OP_SUBSTR,
+    OP_LEFT,
+    OP_RIGHT,
+    OP_SIZE,
+
+    OP_INVERT,
+    OP_AND,
+    OP_OR,
+    OP_XOR,
+    OP_EQUAL,
+    OP_EQUALVERIFY,
+    OP_RESERVED1,
+    OP_RESERVED2,
+
+    OP_1ADD,
+    OP_1SUB,
+    OP_2MUL,
+    OP_2DIV,
+    OP_NEGATE,
+    OP_ABS,
+    OP_NOT,
+    OP_0NOTEQUAL,
+
+    OP_ADD,
+    OP_SUB,
+    OP_MUL,
+    OP_DIV,
+    OP_MOD,
+    OP_LSHIFT,
+    OP_RSHIFT,
+
+    OP_BOOLAND,
+    OP_BOOLOR,
+    OP_NUMEQUAL,
+    OP_NUMEQUALVERIFY,
+    OP_NUMNOTEQUAL,
+    OP_LESSTHAN,
+    OP_GREATERTHAN,
+    OP_LESSTHANOREQUAL,
+    OP_GREATERTHANOREQUAL,
+    OP_MIN,
+    OP_MAX,
+
+    OP_WITHIN,
+
+    OP_RIPEMD160,
+    OP_SHA1,
+    OP_SHA256,
+    OP_HASH160,
+    OP_HASH256,
+    OP_CODESEPARATOR,
+    OP_CHECKSIG,
+    OP_CHECKSIGVERIFY,
+    OP_CHECKMULTISIG,
+    OP_CHECKMULTISIGVERIFY,
+
+    OP_NOP1,
+    OP_CHECKLOCKTIMEVERIFY,
+    OP_CHECKSEQUENCEVERIFY,
+    OP_NOP4,
+    OP_NOP5,
+    OP_NOP6,
+    OP_NOP7,
+    OP_NOP8,
+    OP_NOP9,
+    OP_NOP10,
+
+    OP_SMALLINTEGER,
+    OP_PUBKEYS,
+    OP_PUBKEYHASH,
+    OP_PUBKEY,
+}
+
+OPCODE_NAMES.update({
+    OP_0 : 'OP_0',
+    OP_PUSHDATA1 : 'OP_PUSHDATA1',
+    OP_PUSHDATA2 : 'OP_PUSHDATA2',
+    OP_PUSHDATA4 : 'OP_PUSHDATA4',
+    OP_1NEGATE : 'OP_1NEGATE',
+    OP_RESERVED : 'OP_RESERVED',
+    OP_1 : 'OP_1',
+    OP_2 : 'OP_2',
+    OP_3 : 'OP_3',
+    OP_4 : 'OP_4',
+    OP_5 : 'OP_5',
+    OP_6 : 'OP_6',
+    OP_7 : 'OP_7',
+    OP_8 : 'OP_8',
+    OP_9 : 'OP_9',
+    OP_10 : 'OP_10',
+    OP_11 : 'OP_11',
+    OP_12 : 'OP_12',
+    OP_13 : 'OP_13',
+    OP_14 : 'OP_14',
+    OP_15 : 'OP_15',
+    OP_16 : 'OP_16',
+    OP_NOP : 'OP_NOP',
+    OP_VER : 'OP_VER',
+    OP_IF : 'OP_IF',
+    OP_NOTIF : 'OP_NOTIF',
+    OP_VERIF : 'OP_VERIF',
+    OP_VERNOTIF : 'OP_VERNOTIF',
+    OP_ELSE : 'OP_ELSE',
+    OP_ENDIF : 'OP_ENDIF',
+    OP_VERIFY : 'OP_VERIFY',
+    OP_RETURN : 'OP_RETURN',
+    OP_TOALTSTACK : 'OP_TOALTSTACK',
+    OP_FROMALTSTACK : 'OP_FROMALTSTACK',
+    OP_2DROP : 'OP_2DROP',
+    OP_2DUP : 'OP_2DUP',
+    OP_3DUP : 'OP_3DUP',
+    OP_2OVER : 'OP_2OVER',
+    OP_2ROT : 'OP_2ROT',
+    OP_2SWAP : 'OP_2SWAP',
+    OP_IFDUP : 'OP_IFDUP',
+    OP_DEPTH : 'OP_DEPTH',
+    OP_DROP : 'OP_DROP',
+    OP_DUP : 'OP_DUP',
+    OP_NIP : 'OP_NIP',
+    OP_OVER : 'OP_OVER',
+    OP_PICK : 'OP_PICK',
+    OP_ROLL : 'OP_ROLL',
+    OP_ROT : 'OP_ROT',
+    OP_SWAP : 'OP_SWAP',
+    OP_TUCK : 'OP_TUCK',
+    OP_CAT : 'OP_CAT',
+    OP_SUBSTR : 'OP_SUBSTR',
+    OP_LEFT : 'OP_LEFT',
+    OP_RIGHT : 'OP_RIGHT',
+    OP_SIZE : 'OP_SIZE',
+    OP_INVERT : 'OP_INVERT',
+    OP_AND : 'OP_AND',
+    OP_OR : 'OP_OR',
+    OP_XOR : 'OP_XOR',
+    OP_EQUAL : 'OP_EQUAL',
+    OP_EQUALVERIFY : 'OP_EQUALVERIFY',
+    OP_RESERVED1 : 'OP_RESERVED1',
+    OP_RESERVED2 : 'OP_RESERVED2',
+    OP_1ADD : 'OP_1ADD',
+    OP_1SUB : 'OP_1SUB',
+    OP_2MUL : 'OP_2MUL',
+    OP_2DIV : 'OP_2DIV',
+    OP_NEGATE : 'OP_NEGATE',
+    OP_ABS : 'OP_ABS',
+    OP_NOT : 'OP_NOT',
+    OP_0NOTEQUAL : 'OP_0NOTEQUAL',
+    OP_ADD : 'OP_ADD',
+    OP_SUB : 'OP_SUB',
+    OP_MUL : 'OP_MUL',
+    OP_DIV : 'OP_DIV',
+    OP_MOD : 'OP_MOD',
+    OP_LSHIFT : 'OP_LSHIFT',
+    OP_RSHIFT : 'OP_RSHIFT',
+    OP_BOOLAND : 'OP_BOOLAND',
+    OP_BOOLOR : 'OP_BOOLOR',
+    OP_NUMEQUAL : 'OP_NUMEQUAL',
+    OP_NUMEQUALVERIFY : 'OP_NUMEQUALVERIFY',
+    OP_NUMNOTEQUAL : 'OP_NUMNOTEQUAL',
+    OP_LESSTHAN : 'OP_LESSTHAN',
+    OP_GREATERTHAN : 'OP_GREATERTHAN',
+    OP_LESSTHANOREQUAL : 'OP_LESSTHANOREQUAL',
+    OP_GREATERTHANOREQUAL : 'OP_GREATERTHANOREQUAL',
+    OP_MIN : 'OP_MIN',
+    OP_MAX : 'OP_MAX',
+    OP_WITHIN : 'OP_WITHIN',
+    OP_RIPEMD160 : 'OP_RIPEMD160',
+    OP_SHA1 : 'OP_SHA1',
+    OP_SHA256 : 'OP_SHA256',
+    OP_HASH160 : 'OP_HASH160',
+    OP_HASH256 : 'OP_HASH256',
+    OP_CODESEPARATOR : 'OP_CODESEPARATOR',
+    OP_CHECKSIG : 'OP_CHECKSIG',
+    OP_CHECKSIGVERIFY : 'OP_CHECKSIGVERIFY',
+    OP_CHECKMULTISIG : 'OP_CHECKMULTISIG',
+    OP_CHECKMULTISIGVERIFY : 'OP_CHECKMULTISIGVERIFY',
+    OP_NOP1 : 'OP_NOP1',
+    OP_CHECKLOCKTIMEVERIFY : 'OP_CHECKLOCKTIMEVERIFY',
+    OP_CHECKSEQUENCEVERIFY : 'OP_CHECKSEQUENCEVERIFY',
+    OP_NOP4 : 'OP_NOP4',
+    OP_NOP5 : 'OP_NOP5',
+    OP_NOP6 : 'OP_NOP6',
+    OP_NOP7 : 'OP_NOP7',
+    OP_NOP8 : 'OP_NOP8',
+    OP_NOP9 : 'OP_NOP9',
+    OP_NOP10 : 'OP_NOP10',
+    OP_SMALLINTEGER : 'OP_SMALLINTEGER',
+    OP_PUBKEYS : 'OP_PUBKEYS',
+    OP_PUBKEYHASH : 'OP_PUBKEYHASH',
+    OP_PUBKEY : 'OP_PUBKEY',
+    OP_INVALIDOPCODE : 'OP_INVALIDOPCODE',
+})
+
+OPCODES_BY_NAME = {
+    'OP_0' : OP_0,
+    'OP_PUSHDATA1' : OP_PUSHDATA1,
+    'OP_PUSHDATA2' : OP_PUSHDATA2,
+    'OP_PUSHDATA4' : OP_PUSHDATA4,
+    'OP_1NEGATE' : OP_1NEGATE,
+    'OP_RESERVED' : OP_RESERVED,
+    'OP_1' : OP_1,
+    'OP_2' : OP_2,
+    'OP_3' : OP_3,
+    'OP_4' : OP_4,
+    'OP_5' : OP_5,
+    'OP_6' : OP_6,
+    'OP_7' : OP_7,
+    'OP_8' : OP_8,
+    'OP_9' : OP_9,
+    'OP_10' : OP_10,
+    'OP_11' : OP_11,
+    'OP_12' : OP_12,
+    'OP_13' : OP_13,
+    'OP_14' : OP_14,
+    'OP_15' : OP_15,
+    'OP_16' : OP_16,
+    'OP_NOP' : OP_NOP,
+    'OP_VER' : OP_VER,
+    'OP_IF' : OP_IF,
+    'OP_NOTIF' : OP_NOTIF,
+    'OP_VERIF' : OP_VERIF,
+    'OP_VERNOTIF' : OP_VERNOTIF,
+    'OP_ELSE' : OP_ELSE,
+    'OP_ENDIF' : OP_ENDIF,
+    'OP_VERIFY' : OP_VERIFY,
+    'OP_RETURN' : OP_RETURN,
+    'OP_TOALTSTACK' : OP_TOALTSTACK,
+    'OP_FROMALTSTACK' : OP_FROMALTSTACK,
+    'OP_2DROP' : OP_2DROP,
+    'OP_2DUP' : OP_2DUP,
+    'OP_3DUP' : OP_3DUP,
+    'OP_2OVER' : OP_2OVER,
+    'OP_2ROT' : OP_2ROT,
+    'OP_2SWAP' : OP_2SWAP,
+    'OP_IFDUP' : OP_IFDUP,
+    'OP_DEPTH' : OP_DEPTH,
+    'OP_DROP' : OP_DROP,
+    'OP_DUP' : OP_DUP,
+    'OP_NIP' : OP_NIP,
+    'OP_OVER' : OP_OVER,
+    'OP_PICK' : OP_PICK,
+    'OP_ROLL' : OP_ROLL,
+    'OP_ROT' : OP_ROT,
+    'OP_SWAP' : OP_SWAP,
+    'OP_TUCK' : OP_TUCK,
+    'OP_CAT' : OP_CAT,
+    'OP_SUBSTR' : OP_SUBSTR,
+    'OP_LEFT' : OP_LEFT,
+    'OP_RIGHT' : OP_RIGHT,
+    'OP_SIZE' : OP_SIZE,
+    'OP_INVERT' : OP_INVERT,
+    'OP_AND' : OP_AND,
+    'OP_OR' : OP_OR,
+    'OP_XOR' : OP_XOR,
+    'OP_EQUAL' : OP_EQUAL,
+    'OP_EQUALVERIFY' : OP_EQUALVERIFY,
+    'OP_RESERVED1' : OP_RESERVED1,
+    'OP_RESERVED2' : OP_RESERVED2,
+    'OP_1ADD' : OP_1ADD,
+    'OP_1SUB' : OP_1SUB,
+    'OP_2MUL' : OP_2MUL,
+    'OP_2DIV' : OP_2DIV,
+    'OP_NEGATE' : OP_NEGATE,
+    'OP_ABS' : OP_ABS,
+    'OP_NOT' : OP_NOT,
+    'OP_0NOTEQUAL' : OP_0NOTEQUAL,
+    'OP_ADD' : OP_ADD,
+    'OP_SUB' : OP_SUB,
+    'OP_MUL' : OP_MUL,
+    'OP_DIV' : OP_DIV,
+    'OP_MOD' : OP_MOD,
+    'OP_LSHIFT' : OP_LSHIFT,
+    'OP_RSHIFT' : OP_RSHIFT,
+    'OP_BOOLAND' : OP_BOOLAND,
+    'OP_BOOLOR' : OP_BOOLOR,
+    'OP_NUMEQUAL' : OP_NUMEQUAL,
+    'OP_NUMEQUALVERIFY' : OP_NUMEQUALVERIFY,
+    'OP_NUMNOTEQUAL' : OP_NUMNOTEQUAL,
+    'OP_LESSTHAN' : OP_LESSTHAN,
+    'OP_GREATERTHAN' : OP_GREATERTHAN,
+    'OP_LESSTHANOREQUAL' : OP_LESSTHANOREQUAL,
+    'OP_GREATERTHANOREQUAL' : OP_GREATERTHANOREQUAL,
+    'OP_MIN' : OP_MIN,
+    'OP_MAX' : OP_MAX,
+    'OP_WITHIN' : OP_WITHIN,
+    'OP_RIPEMD160' : OP_RIPEMD160,
+    'OP_SHA1' : OP_SHA1,
+    'OP_SHA256' : OP_SHA256,
+    'OP_HASH160' : OP_HASH160,
+    'OP_HASH256' : OP_HASH256,
+    'OP_CODESEPARATOR' : OP_CODESEPARATOR,
+    'OP_CHECKSIG' : OP_CHECKSIG,
+    'OP_CHECKSIGVERIFY' : OP_CHECKSIGVERIFY,
+    'OP_CHECKMULTISIG' : OP_CHECKMULTISIG,
+    'OP_CHECKMULTISIGVERIFY' : OP_CHECKMULTISIGVERIFY,
+    'OP_NOP1' : OP_NOP1,
+    'OP_CHECKLOCKTIMEVERIFY' : OP_CHECKLOCKTIMEVERIFY,
+    'OP_CHECKSEQUENCEVERIFY' : OP_CHECKSEQUENCEVERIFY,
+    'OP_NOP4' : OP_NOP4,
+    'OP_NOP5' : OP_NOP5,
+    'OP_NOP6' : OP_NOP6,
+    'OP_NOP7' : OP_NOP7,
+    'OP_NOP8' : OP_NOP8,
+    'OP_NOP9' : OP_NOP9,
+    'OP_NOP10' : OP_NOP10,
+    'OP_SMALLINTEGER' : OP_SMALLINTEGER,
+    'OP_PUBKEYS' : OP_PUBKEYS,
+    'OP_PUBKEYHASH' : OP_PUBKEYHASH,
+    'OP_PUBKEY' : OP_PUBKEY,
+}
+
+class CScriptInvalidError(Exception):
+    """Base class for CScript exceptions"""
+    pass
+
+class CScriptTruncatedPushDataError(CScriptInvalidError):
+    """Invalid pushdata due to truncation"""
+    def __init__(self, msg, data):
+        self.data = data
+        super(CScriptTruncatedPushDataError, self).__init__(msg)
+
+# This is used, eg, for blockchain heights in coinbase scripts (bip34)
+class CScriptNum(object):
+    def __init__(self, d=0):
+        self.value = d
+
+    @staticmethod
+    def encode(obj):
+        r = bytearray(0)
+        if obj.value == 0:
+            return bytes(r)
+        neg = obj.value < 0
+        absvalue = -obj.value if neg else obj.value
+        while (absvalue):
+            r.append(absvalue & 0xff)
+            absvalue >>= 8
+        if r[-1] & 0x80:
+            r.append(0x80 if neg else 0)
+        elif neg:
+            r[-1] |= 0x80
+        return bytes(bchr(len(r)) + r)
+
+
+class CScript(bytes):
+    """Serialized script
+
+    A bytes subclass, so you can use this directly whenever bytes are accepted.
+    Note that this means that indexing does *not* work - you'll get an index by
+    byte rather than opcode. This format was chosen for efficiency so that the
+    general case would not require creating a lot of little CScriptOP objects.
+
+    iter(script) however does iterate by opcode.
+    """
+    @classmethod
+    def __coerce_instance(cls, other):
+        # Coerce other into bytes
+        if isinstance(other, CScriptOp):
+            other = bchr(other)
+        elif isinstance(other, CScriptNum):
+            if (other.value == 0):
+                other = bchr(CScriptOp(OP_0))
+            else:
+                other = CScriptNum.encode(other)
+        elif isinstance(other, int):
+            if 0 <= other <= 16:
+                other = bytes(bchr(CScriptOp.encode_op_n(other)))
+            elif other == -1:
+                other = bytes(bchr(OP_1NEGATE))
+            else:
+                other = CScriptOp.encode_op_pushdata(bn2vch(other))
+        elif isinstance(other, (bytes, bytearray)):
+            other = CScriptOp.encode_op_pushdata(other)
+        return other
+
+    def __add__(self, other):
+        # Do the coercion outside of the try block so that errors in it are
+        # noticed.
+        other = self.__coerce_instance(other)
+
+        try:
+            # bytes.__add__ always returns bytes instances unfortunately
+            return CScript(super(CScript, self).__add__(other))
+        except TypeError:
+            raise TypeError('Can not add a %r instance to a CScript' % other.__class__)
+
+    def join(self, iterable):
+        # join makes no sense for a CScript()
+        raise NotImplementedError
+
+    def __new__(cls, value=b''):
+        if isinstance(value, bytes) or isinstance(value, bytearray):
+            return super(CScript, cls).__new__(cls, value)
+        else:
+            def coerce_iterable(iterable):
+                for instance in iterable:
+                    yield cls.__coerce_instance(instance)
+            # Annoyingly on both python2 and python3 bytes.join() always
+            # returns a bytes instance even when subclassed.
+            return super(CScript, cls).__new__(cls, b''.join(coerce_iterable(value)))
+
+    def raw_iter(self):
+        """Raw iteration
+
+        Yields tuples of (opcode, data, sop_idx) so that the different possible
+        PUSHDATA encodings can be accurately distinguished, as well as
+        determining the exact opcode byte indexes. (sop_idx)
+        """
+        i = 0
+        while i < len(self):
+            sop_idx = i
+            opcode = bord(self[i])
+            i += 1
+
+            if opcode > OP_PUSHDATA4:
+                yield (opcode, None, sop_idx)
+            else:
+                datasize = None
+                pushdata_type = None
+                if opcode < OP_PUSHDATA1:
+                    pushdata_type = 'PUSHDATA(%d)' % opcode
+                    datasize = opcode
+
+                elif opcode == OP_PUSHDATA1:
+                    pushdata_type = 'PUSHDATA1'
+                    if i >= len(self):
+                        raise CScriptInvalidError('PUSHDATA1: missing data length')
+                    datasize = bord(self[i])
+                    i += 1
+
+                elif opcode == OP_PUSHDATA2:
+                    pushdata_type = 'PUSHDATA2'
+                    if i + 1 >= len(self):
+                        raise CScriptInvalidError('PUSHDATA2: missing data length')
+                    datasize = bord(self[i]) + (bord(self[i+1]) << 8)
+                    i += 2
+
+                elif opcode == OP_PUSHDATA4:
+                    pushdata_type = 'PUSHDATA4'
+                    if i + 3 >= len(self):
+                        raise CScriptInvalidError('PUSHDATA4: missing data length')
+                    datasize = bord(self[i]) + (bord(self[i+1]) << 8) + (bord(self[i+2]) << 16) + (bord(self[i+3]) << 24)
+                    i += 4
+
+                else:
+                    assert False # shouldn't happen
+
+
+                data = bytes(self[i:i+datasize])
+
+                # Check for truncation
+                if len(data) < datasize:
+                    raise CScriptTruncatedPushDataError('%s: truncated data' % pushdata_type, data)
+
+                i += datasize
+
+                yield (opcode, data, sop_idx)
+
+    def __iter__(self):
+        """'Cooked' iteration
+
+        Returns either a CScriptOP instance, an integer, or bytes, as
+        appropriate.
+
+        See raw_iter() if you need to distinguish the different possible
+        PUSHDATA encodings.
+        """
+        for (opcode, data, sop_idx) in self.raw_iter():
+            if data is not None:
+                yield data
+            else:
+                opcode = CScriptOp(opcode)
+
+                if opcode.is_small_int():
+                    yield opcode.decode_op_n()
+                else:
+                    yield CScriptOp(opcode)
+
+    def __repr__(self):
+        # For Python3 compatibility add b before strings so testcases don't
+        # need to change
+        def _repr(o):
+            if isinstance(o, bytes):
+                return b"x('%s')" % hexlify(o).decode('ascii')
+            else:
+                return repr(o)
+
+        ops = []
+        i = iter(self)
+        while True:
+            op = None
+            try:
+                op = _repr(next(i))
+            except CScriptTruncatedPushDataError as err:
+                op = '%s...<ERROR: %s>' % (_repr(err.data), err)
+                break
+            except CScriptInvalidError as err:
+                op = '<ERROR: %s>' % err
+                break
+            except StopIteration:
+                break
+            finally:
+                if op is not None:
+                    ops.append(op)
+
+        return "CScript([%s])" % ', '.join(ops)
+
+    def GetSigOpCount(self, fAccurate):
+        """Get the SigOp count.
+
+        fAccurate - Accurately count CHECKMULTISIG, see BIP16 for details.
+
+        Note that this is consensus-critical.
+        """
+        n = 0
+        lastOpcode = OP_INVALIDOPCODE
+        for (opcode, data, sop_idx) in self.raw_iter():
+            if opcode in (OP_CHECKSIG, OP_CHECKSIGVERIFY):
+                n += 1
+            elif opcode in (OP_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY):
+                if fAccurate and (OP_1 <= lastOpcode <= OP_16):
+                    n += opcode.decode_op_n()
+                else:
+                    n += 20
+            lastOpcode = opcode
+        return n
+
+
+SIGHASH_ALL = 1
+SIGHASH_NONE = 2
+SIGHASH_SINGLE = 3
+SIGHASH_ANYONECANPAY = 0x80
+
+def FindAndDelete(script, sig):
+    """Consensus critical, see FindAndDelete() in Satoshi codebase"""
+    r = b''
+    last_sop_idx = sop_idx = 0
+    skip = True
+    for (opcode, data, sop_idx) in script.raw_iter():
+        if not skip:
+            r += script[last_sop_idx:sop_idx]
+        last_sop_idx = sop_idx
+        if script[sop_idx:sop_idx + len(sig)] == sig:
+            skip = True
+        else:
+            skip = False
+    if not skip:
+        r += script[last_sop_idx:]
+    return CScript(r)
+
+
+def SignatureHash(script, txTo, inIdx, hashtype):
+    """Consensus-correct SignatureHash
+
+    Returns (hash, err) to precisely match the consensus-critical behavior of
+    the SIGHASH_SINGLE bug. (inIdx is *not* checked for validity)
+    """
+    HASH_ONE = b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+
+    if inIdx >= len(txTo.vin):
+        return (HASH_ONE, "inIdx %d out of range (%d)" % (inIdx, len(txTo.vin)))
+    txtmp = CTransaction(txTo)
+
+    for txin in txtmp.vin:
+        txin.scriptSig = b''
+    txtmp.vin[inIdx].scriptSig = FindAndDelete(script, CScript([OP_CODESEPARATOR]))
+
+    if (hashtype & 0x1f) == SIGHASH_NONE:
+        txtmp.vout = []
+
+        for i in range(len(txtmp.vin)):
+            if i != inIdx:
+                txtmp.vin[i].nSequence = 0
+
+    elif (hashtype & 0x1f) == SIGHASH_SINGLE:
+        outIdx = inIdx
+        if outIdx >= len(txtmp.vout):
+            return (HASH_ONE, "outIdx %d out of range (%d)" % (outIdx, len(txtmp.vout)))
+
+        tmp = txtmp.vout[outIdx]
+        txtmp.vout = []
+        for i in range(outIdx):
+            txtmp.vout.append(CTxOut())
+        txtmp.vout.append(tmp)
+
+        for i in range(len(txtmp.vin)):
+            if i != inIdx:
+                txtmp.vin[i].nSequence = 0
+
+    if hashtype & SIGHASH_ANYONECANPAY:
+        tmp = txtmp.vin[inIdx]
+        txtmp.vin = []
+        txtmp.vin.append(tmp)
+
+    s = txtmp.serialize()
+    s += struct.pack(b"<I", hashtype)
+
+    hash = hash256(s)
+
+    return (hash, None)
+
+# TODO: Allow cached hashPrevouts/hashSequence/hashOutputs to be provided.
+# Performance optimization probably not necessary for python tests, however.
+# Note that this corresponds to sigversion == 1 in EvalScript, which is used
+# for version 0 witnesses.
+def SegwitVersion1SignatureHash(script, txTo, inIdx, hashtype, amount):
+
+    hashPrevouts = 0
+    hashSequence = 0
+    hashOutputs = 0
+
+    if not (hashtype & SIGHASH_ANYONECANPAY):
+        serialize_prevouts = bytes()
+        for i in txTo.vin:
+            serialize_prevouts += i.prevout.serialize()
+        hashPrevouts = uint256_from_str(hash256(serialize_prevouts))
+
+    if (not (hashtype & SIGHASH_ANYONECANPAY) and (hashtype & 0x1f) != SIGHASH_SINGLE and (hashtype & 0x1f) != SIGHASH_NONE):
+        serialize_sequence = bytes()
+        for i in txTo.vin:
+            serialize_sequence += struct.pack("<I", i.nSequence)
+        hashSequence = uint256_from_str(hash256(serialize_sequence))
+
+    if ((hashtype & 0x1f) != SIGHASH_SINGLE and (hashtype & 0x1f) != SIGHASH_NONE):
+        serialize_outputs = bytes()
+        for o in txTo.vout:
+            serialize_outputs += o.serialize()
+        hashOutputs = uint256_from_str(hash256(serialize_outputs))
+    elif ((hashtype & 0x1f) == SIGHASH_SINGLE and inIdx < len(txTo.vout)):
+        serialize_outputs = txTo.vout[inIdx].serialize()
+        hashOutputs = uint256_from_str(hash256(serialize_outputs))
+
+    ss = bytes()
+    ss += struct.pack("<i", txTo.nVersion)
+    ss += ser_uint256(hashPrevouts)
+    ss += ser_uint256(hashSequence)
+    ss += txTo.vin[inIdx].prevout.serialize()
+    ss += ser_string(script)
+    ss += struct.pack("<q", amount)
+    ss += struct.pack("<I", txTo.vin[inIdx].nSequence)
+    ss += ser_uint256(hashOutputs)
+    ss += struct.pack("<i", txTo.nLockTime)
+    ss += struct.pack("<I", hashtype)
+
+    return hash256(ss)

basicswap/interface/contrib/nav_test_framework/siphash.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+# Copyright (c) 2016-2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Specialized SipHash-2-4 implementations.
+
+This implements SipHash-2-4 for 256-bit integers.
+"""
+
+def rotl64(n, b):
+    return n >> (64 - b) | (n & ((1 << (64 - b)) - 1)) << b
+
+def siphash_round(v0, v1, v2, v3):
+    v0 = (v0 + v1) & ((1 << 64) - 1)
+    v1 = rotl64(v1, 13)
+    v1 ^= v0
+    v0 = rotl64(v0, 32)
+    v2 = (v2 + v3) & ((1 << 64) - 1)
+    v3 = rotl64(v3, 16)
+    v3 ^= v2
+    v0 = (v0 + v3) & ((1 << 64) - 1)
+    v3 = rotl64(v3, 21)
+    v3 ^= v0
+    v2 = (v2 + v1) & ((1 << 64) - 1)
+    v1 = rotl64(v1, 17)
+    v1 ^= v2
+    v2 = rotl64(v2, 32)
+    return (v0, v1, v2, v3)
+
+def siphash256(k0, k1, h):
+    n0 = h & ((1 << 64) - 1)
+    n1 = (h >> 64) & ((1 << 64) - 1)
+    n2 = (h >> 128) & ((1 << 64) - 1)
+    n3 = (h >> 192) & ((1 << 64) - 1)
+    v0 = 0x736f6d6570736575 ^ k0
+    v1 = 0x646f72616e646f6d ^ k1
+    v2 = 0x6c7967656e657261 ^ k0
+    v3 = 0x7465646279746573 ^ k1 ^ n0
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n0
+    v3 ^= n1
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n1
+    v3 ^= n2
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n2
+    v3 ^= n3
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= n3
+    v3 ^= 0x2000000000000000
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0 ^= 0x2000000000000000
+    v2 ^= 0xFF
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    v0, v1, v2, v3 = siphash_round(v0, v1, v2, v3)
+    return v0 ^ v1 ^ v2 ^ v3

basicswap/interface/contrib/nav_test_framework/util.py

@@ -0,0 +1,700 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+
+#
+# Helpful routines for regression testing
+#
+
+import os
+import sys
+
+from binascii import hexlify, unhexlify
+from base64 import b64encode
+from decimal import Decimal, ROUND_DOWN
+import json
+import http.client
+import random
+import shutil
+import subprocess
+import time
+import re
+import errno
+
+from . import coverage
+from .authproxy import AuthServiceProxy, JSONRPCException
+
+COVERAGE_DIR = None
+
+# The maximum number of nodes a single test can spawn
+MAX_NODES = 8
+# Don't assign rpc or p2p ports lower than this
+PORT_MIN = 11000
+# The number of ports to "reserve" for p2p and rpc, each
+PORT_RANGE = 5000
+
+NAVCOIND_PROC_WAIT_TIMEOUT = 60
+
+
+class PortSeed:
+    # Must be initialized with a unique integer for each process
+    n = None
+
+#Set Mocktime default to OFF.
+#MOCKTIME is only needed for scripts that use the
+#cached version of the blockchain.  If the cached
+#version of the blockchain is used without MOCKTIME
+#then the mempools will not sync due to IBD.
+MOCKTIME = 0
+
+def enable_mocktime():
+    #For backwared compatibility of the python scripts
+    #with previous versions of the cache, set MOCKTIME
+    #to Jan 1, 2014 + (201 * 10 * 60)
+    global MOCKTIME
+    MOCKTIME = 1388534400 + (201 * 10 * 60)
+
+def disable_mocktime():
+    global MOCKTIME
+    MOCKTIME = 0
+
+def get_mocktime():
+    return MOCKTIME
+
+def enable_coverage(dirname):
+    """Maintain a log of which RPC calls are made during testing."""
+    global COVERAGE_DIR
+    COVERAGE_DIR = dirname
+
+def get_rpc_proxy(url, node_number, timeout=None):
+    """
+    Args:
+        url (str): URL of the RPC server to call
+        node_number (int): the node number (or id) that this calls to
+
+    Kwargs:
+        timeout (int): HTTP timeout in seconds
+
+    Returns:
+        AuthServiceProxy. convenience object for making RPC calls.
+
+    """
+    proxy_kwargs = {}
+    if timeout is not None:
+        proxy_kwargs['timeout'] = timeout
+
+    proxy = AuthServiceProxy(url, **proxy_kwargs)
+    proxy.url = url  # store URL on proxy for info
+
+    coverage_logfile = coverage.get_filename(
+        COVERAGE_DIR, node_number) if COVERAGE_DIR else None
+
+    return coverage.AuthServiceProxyWrapper(proxy, coverage_logfile)
+
+
+def p2p_port(n):
+    assert(n <= MAX_NODES)
+    return PORT_MIN + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
+
+def rpc_port(n):
+    return PORT_MIN + PORT_RANGE + n + (MAX_NODES * PortSeed.n) % (PORT_RANGE - 1 - MAX_NODES)
+
+def check_json_precision():
+    """Make sure json library being used does not lose precision converting NAV values"""
+    n = Decimal("20000000.00000003")
+    satoshis = int(json.loads(json.dumps(float(n)))*1.0e8)
+    if satoshis != 2000000000000003:
+        raise RuntimeError("JSON encode/decode loses precision")
+
+def count_bytes(hex_string):
+    return len(bytearray.fromhex(hex_string))
+
+def bytes_to_hex_str(byte_str):
+    return hexlify(byte_str).decode('ascii')
+
+def hex_str_to_bytes(hex_str):
+    return unhexlify(hex_str.encode('ascii'))
+
+def str_to_b64str(string):
+    return b64encode(string.encode('utf-8')).decode('ascii')
+
+def sync_blocks(rpc_connections, wait=1, timeout=60):
+    """
+    Wait until everybody has the same tip
+    """
+    while timeout > 0:
+        tips = [ x.getbestblockhash() for x in rpc_connections ]
+        if tips == [ tips[0] ]*len(tips):
+        #if all x.getblockhash() in tips are the same return True
+            return True
+        time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Block sync failed")
+
+def sync_mempools(rpc_connections, wait=1, timeout=60):
+    """
+    Wait until everybody has the same transactions in their memory
+    pools
+    """
+    while timeout > 0:
+        pool = set(rpc_connections[0].getrawmempool())
+        num_match = 1
+        for i in range(1, len(rpc_connections)):
+            if set(rpc_connections[i].getrawmempool()) == pool:
+                num_match = num_match+1
+        if num_match == len(rpc_connections):
+            return True
+        time.sleep(wait)
+        timeout -= wait
+    raise AssertionError("Mempool sync failed")
+
+navcoind_processes = {}
+
+def initialize_datadir(dirname, n):
+    datadir = os.path.join(dirname, "node"+str(n))
+    if not os.path.isdir(datadir):
+        os.makedirs(datadir)
+    rpc_u, rpc_p = rpc_auth_pair(n)
+    with open(os.path.join(datadir, "navcoin.conf"), 'w') as f:
+        f.write("devnet=1\n")
+        f.write("rpcuser=" + rpc_u + "\n")
+        f.write("rpcpassword=" + rpc_p + "\n")
+        f.write("port="+str(p2p_port(n))+"\n")
+        f.write("rpcport="+str(rpc_port(n))+"\n")
+        f.write("listenonion=0\n")
+        f.write("dandelion=0\n")
+        f.write("ntpminmeasures=-1\n")
+        f.write("torserver=0\n")
+        f.write("suppressblsctwarning=1\n")
+    return datadir
+
+def rpc_auth_pair(n):
+    return 'rpcuser💻' + str(n), 'rpcpass🔑' + str(n)
+
+def rpc_url(i, rpchost=None):
+    rpc_u, rpc_p = rpc_auth_pair(i)
+    return "http://%s:%s@%s:%d" % (rpc_u, rpc_p, rpchost or '127.0.0.1', rpc_port(i))
+
+def wait_for_navcoind_start(process, url, i):
+    '''
+    Wait for navcoind to start. This means that RPC is accessible and fully initialized.
+    Raise an exception if navcoind exits during initialization.
+    '''
+    polls_interval = 1.0 / 4
+    runtime = 60
+    while runtime > 0:
+        if process.poll() is not None:
+            raise Exception('navcoind exited with status %i during initialization' % process.returncode)
+        try:
+            # print('Checking RPC')
+            rpc = get_rpc_proxy(url, i)
+            blocks = rpc.getblockcount()
+            # print('RPC replied with blocks: %i' % blocks)
+            return # break out of loop on success
+        except IOError as e:
+            if e.errno != errno.ECONNREFUSED: # Port not yet open?
+                raise # unknown IO error
+            # else:
+            #     print('Waiting for port')
+        except JSONRPCException as e: # Initialization phase
+            if e.error['code'] != -28: # RPC in warmup?
+                raise # unkown JSON RPC exception
+            # else:
+            #     print('RPC in warmup')
+        time.sleep(polls_interval)
+        runtime -= polls_interval
+    raise Exception('navcoind RPC timeout')
+
+def initialize_chain(test_dir, num_nodes):
+    """
+    Create a cache of a 200-block-long chain (with wallet) for MAX_NODES
+    Afterward, create num_nodes copies from the cache
+    """
+
+    assert num_nodes <= MAX_NODES
+    create_cache = False
+    for i in range(MAX_NODES):
+        if not os.path.isdir(os.path.join('cache', 'node'+str(i))):
+            create_cache = True
+            break
+
+    if create_cache:
+
+        #find and delete old cache directories if any exist
+        for i in range(MAX_NODES):
+            if os.path.isdir(os.path.join("cache","node"+str(i))):
+                shutil.rmtree(os.path.join("cache","node"+str(i)))
+
+        # Create cache directories, run navcoinds:
+        for i in range(MAX_NODES):
+            datadir=initialize_datadir("cache", i)
+            args = [ os.getenv("NAVCOIND", "navcoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
+            if i > 0:
+                args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
+            navcoind_processes[i] = subprocess.Popen(args)
+            if os.getenv("PYTHON_DEBUG", ""):
+                print("initialize_chain: navcoind started, waiting for RPC to come up")
+            wait_for_navcoind_start(navcoind_processes[i], rpc_url(i), i)
+            if os.getenv("PYTHON_DEBUG", ""):
+                print("initialize_chain: RPC succesfully started")
+
+        rpcs = []
+        for i in range(MAX_NODES):
+            try:
+                rpcs.append(get_rpc_proxy(rpc_url(i), i))
+            except:
+                sys.stderr.write("Error connecting to "+url+"\n")
+                sys.exit(1)
+
+        # Create a 200-block-long chain; each of the 4 first nodes
+        # gets 25 mature blocks and 25 immature.
+        # Note: To preserve compatibility with older versions of
+        # initialize_chain, only 4 nodes will generate coins.
+        #
+        # blocks are created with timestamps 10 minutes apart
+        # starting from 2010 minutes in the past
+        enable_mocktime()
+        block_time = get_mocktime() - (201 * 10 * 60)
+        for i in range(2):
+            for peer in range(4):
+                for j in range(25):
+                    set_node_times(rpcs, block_time)
+                    slow_gen(rpcs[peer], 1)
+                    block_time += 10*60
+                # Must sync before next peer starts generating blocks
+                sync_blocks(rpcs)
+
+        # Shut them down, and clean up cache directories:
+        stop_nodes(rpcs)
+        wait_navcoinds()
+        disable_mocktime()
+        for i in range(MAX_NODES):
+            os.remove(log_filename("cache", i, "debug.log"))
+            os.remove(log_filename("cache", i, "db.log"))
+            os.remove(log_filename("cache", i, "peers.dat"))
+            os.remove(log_filename("cache", i, "fee_estimates.dat"))
+
+    for i in range(num_nodes):
+        from_dir = os.path.join("cache", "node"+str(i))
+        to_dir = os.path.join(test_dir,  "node"+str(i))
+        shutil.copytree(from_dir, to_dir)
+        initialize_datadir(test_dir, i) # Overwrite port/rpcport in navcoin.conf
+
+def initialize_chain_clean(test_dir, num_nodes):
+    """
+    Create an empty blockchain and num_nodes wallets.
+    Useful if a test case wants complete control over initialization.
+    """
+    for i in range(num_nodes):
+        datadir=initialize_datadir(test_dir, i)
+
+
+def _rpchost_to_args(rpchost):
+    '''Convert optional IP:port spec to rpcconnect/rpcport args'''
+    if rpchost is None:
+        return []
+
+    match = re.match('(\[[0-9a-fA-f:]+\]|[^:]+)(?::([0-9]+))?$', rpchost)
+    if not match:
+        raise ValueError('Invalid RPC host spec ' + rpchost)
+
+    rpcconnect = match.group(1)
+    rpcport = match.group(2)
+
+    if rpcconnect.startswith('['): # remove IPv6 [...] wrapping
+        rpcconnect = rpcconnect[1:-1]
+
+    rv = ['-rpcconnect=' + rpcconnect]
+    if rpcport:
+        rv += ['-rpcport=' + rpcport]
+    return rv
+
+def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=None):
+    """
+    Start a navcoind and return RPC connection to it
+    """
+    datadir = os.path.join(dirname, "node"+str(i))
+    if binary is None:
+        binary = os.getenv("NAVCOIND", "navcoind")
+    args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-mocktime="+str(get_mocktime()) ]
+    if extra_args is not None: args.extend(extra_args)
+    navcoind_processes[i] = subprocess.Popen(args)
+    if os.getenv("PYTHON_DEBUG", ""):
+        print("start_node: navcoind started, waiting for RPC to come up")
+    url = rpc_url(i, rpchost)
+    wait_for_navcoind_start(navcoind_processes[i], url, i)
+    if os.getenv("PYTHON_DEBUG", ""):
+        print("start_node: RPC succesfully started")
+    proxy = get_rpc_proxy(url, i, timeout=timewait)
+
+    if COVERAGE_DIR:
+        coverage.write_all_rpc_commands(COVERAGE_DIR, proxy)
+
+    return proxy
+
+def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None):
+    """
+    Start multiple navcoinds, return RPC connections to them
+    """
+    if extra_args is None: extra_args = [ None for _ in range(num_nodes) ]
+    if binary is None: binary = [ None for _ in range(num_nodes) ]
+    rpcs = []
+    try:
+        for i in range(num_nodes):
+            rpcs.append(start_node(i, dirname, extra_args[i], rpchost, binary=binary[i]))
+    except: # If one node failed to start, stop the others
+        stop_nodes(rpcs)
+        raise
+    return rpcs
+
+def log_filename(dirname, n_node, logname):
+    return os.path.join(dirname, "node"+str(n_node), "devnet", logname)
+
+def stop_node(node, i):
+    try:
+        node.stop()
+    except http.client.CannotSendRequest as e:
+        print("WARN: Unable to stop node: " + repr(e))
+    navcoind_processes[i].wait(timeout=NAVCOIND_PROC_WAIT_TIMEOUT)
+    del navcoind_processes[i]
+
+def stop_nodes(nodes):
+    for node in nodes:
+        try:
+            node.stop()
+        except http.client.CannotSendRequest as e:
+            print("WARN: Unable to stop node: " + repr(e))
+    del nodes[:] # Emptying array closes connections as a side effect
+
+def set_node_times(nodes, t):
+    for node in nodes:
+        node.setmocktime(t)
+
+def wait_navcoinds():
+    # Wait for all navcoinds to cleanly exit
+    for navcoind in navcoind_processes.values():
+        navcoind.wait(timeout=NAVCOIND_PROC_WAIT_TIMEOUT)
+    navcoind_processes.clear()
+
+def connect_nodes(from_connection, node_num):
+    ip_port = "127.0.0.1:"+str(p2p_port(node_num))
+    from_connection.addnode(ip_port, "onetry")
+    # poll until version handshake complete to avoid race conditions
+    # with transaction relaying
+    while any(peer['version'] == 0 for peer in from_connection.getpeerinfo()):
+        time.sleep(0.1)
+
+def connect_nodes_bi(nodes, a, b):
+    connect_nodes(nodes[a], b)
+    connect_nodes(nodes[b], a)
+
+def find_output(node, txid, amount):
+    """
+    Return index to output of txid with value amount
+    Raises exception if there is none.
+    """
+    txdata = node.getrawtransaction(txid, 1)
+    for i in range(len(txdata["vout"])):
+        if txdata["vout"][i]["value"] == amount:
+            return i
+    raise RuntimeError("find_output txid %s : %s not found"%(txid,str(amount)))
+
+
+def gather_inputs(from_node, amount_needed, confirmations_required=1):
+    """
+    Return a random set of unspent txouts that are enough to pay amount_needed
+    """
+    assert(confirmations_required >=0)
+    utxo = from_node.listunspent(confirmations_required)
+    random.shuffle(utxo)
+    inputs = []
+    total_in = Decimal("0.00000000")
+    while total_in < amount_needed and len(utxo) > 0:
+        t = utxo.pop()
+        total_in += t["amount"]
+        inputs.append({ "txid" : t["txid"], "vout" : t["vout"], "address" : t["address"] } )
+    if total_in < amount_needed:
+        raise RuntimeError("Insufficient funds: need %d, have %d"%(amount_needed, total_in))
+    return (total_in, inputs)
+
+def make_change(from_node, amount_in, amount_out, fee):
+    """
+    Create change output(s), return them
+    """
+    outputs = {}
+    amount = amount_out+fee
+    change = amount_in - amount
+    if change > amount*2:
+        # Create an extra change output to break up big inputs
+        change_address = from_node.getnewaddress()
+        # Split change in two, being careful of rounding:
+        outputs[change_address] = Decimal(change/2).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
+        change = amount_in - amount - outputs[change_address]
+    if change > 0:
+        outputs[from_node.getnewaddress()] = change
+    return outputs
+
+def send_zeropri_transaction(from_node, to_node, amount, fee):
+    """
+    Create&broadcast a zero-priority transaction.
+    Returns (txid, hex-encoded-txdata)
+    Ensures transaction is zero-priority by first creating a send-to-self,
+    then using its output
+    """
+
+    # Create a send-to-self with confirmed inputs:
+    self_address = from_node.getnewaddress()
+    (total_in, inputs) = gather_inputs(from_node, amount+fee*2)
+    outputs = make_change(from_node, total_in, amount+fee, fee)
+    outputs[self_address] = float(amount+fee)
+
+    self_rawtx = from_node.createrawtransaction(inputs, outputs)
+    self_signresult = from_node.signrawtransaction(self_rawtx)
+    self_txid = from_node.sendrawtransaction(self_signresult["hex"], True)
+
+    vout = find_output(from_node, self_txid, amount+fee)
+    # Now immediately spend the output to create a 1-input, 1-output
+    # zero-priority transaction:
+    inputs = [ { "txid" : self_txid, "vout" : vout } ]
+    outputs = { to_node.getnewaddress() : float(amount) }
+
+    rawtx = from_node.createrawtransaction(inputs, outputs)
+    signresult = from_node.signrawtransaction(rawtx)
+    txid = from_node.sendrawtransaction(signresult["hex"], True)
+
+    return (txid, signresult["hex"])
+
+def random_zeropri_transaction(nodes, amount, min_fee, fee_increment, fee_variants):
+    """
+    Create a random zero-priority transaction.
+    Returns (txid, hex-encoded-transaction-data, fee)
+    """
+    from_node = random.choice(nodes)
+    to_node = random.choice(nodes)
+    fee = min_fee + fee_increment*random.randint(0,fee_variants)
+    (txid, txhex) = send_zeropri_transaction(from_node, to_node, amount, fee)
+    return (txid, txhex, fee)
+
+def random_transaction(nodes, amount, min_fee, fee_increment, fee_variants):
+    """
+    Create a random transaction.
+    Returns (txid, hex-encoded-transaction-data, fee)
+    """
+    from_node = random.choice(nodes)
+    to_node = random.choice(nodes)
+    fee = min_fee + fee_increment*random.randint(0,fee_variants)
+
+    (total_in, inputs) = gather_inputs(from_node, amount+fee)
+    outputs = make_change(from_node, total_in, amount, fee)
+    outputs[to_node.getnewaddress()] = float(amount)
+
+    rawtx = from_node.createrawtransaction(inputs, outputs)
+    signresult = from_node.signrawtransaction(rawtx)
+    txid = from_node.sendrawtransaction(signresult["hex"], True)
+
+    return (txid, signresult["hex"], fee)
+
+def assert_fee_amount(fee, tx_size, fee_per_kB):
+    """Assert the fee was in range"""
+    target_fee = tx_size * fee_per_kB / 1000
+    if fee < target_fee:
+        raise AssertionError("Fee of %s NAV too low! (Should be %s NAV)"%(str(fee), str(target_fee)))
+    # allow the wallet's estimation to be at most 2 bytes off
+    if fee > (tx_size + 2) * fee_per_kB / 1000:
+        raise AssertionError("Fee of %s NAV too high! (Should be %s NAV)"%(str(fee), str(target_fee)))
+
+def assert_equal(thing1, thing2):
+    if thing1 != thing2:
+        raise AssertionError("%s != %s"%(str(thing1),str(thing2)))
+
+def assert_greater_than(thing1, thing2):
+    if thing1 <= thing2:
+        raise AssertionError("%s <= %s"%(str(thing1),str(thing2)))
+
+def assert_raises(exc, fun, *args, **kwds):
+    try:
+        fun(*args, **kwds)
+    except exc:
+        pass
+    except Exception as e:
+        raise AssertionError("Unexpected exception raised: "+type(e).__name__)
+    else:
+        raise AssertionError("No exception raised")
+
+def assert_is_hex_string(string):
+    try:
+        int(string, 16)
+    except Exception as e:
+        raise AssertionError(
+            "Couldn't interpret %r as hexadecimal; raised: %s" % (string, e))
+
+def assert_is_hash_string(string, length=64):
+    if not isinstance(string, str):
+        raise AssertionError("Expected a string, got type %r" % type(string))
+    elif length and len(string) != length:
+        raise AssertionError(
+            "String of length %d expected; got %d" % (length, len(string)))
+    elif not re.match('[abcdef0-9]+$', string):
+        raise AssertionError(
+            "String %r contains invalid characters for a hash." % string)
+
+def assert_array_result(object_array, to_match, expected, should_not_find = False):
+    """
+        Pass in array of JSON objects, a dictionary with key/value pairs
+        to match against, and another dictionary with expected key/value
+        pairs.
+        If the should_not_find flag is true, to_match should not be found
+        in object_array
+        """
+    if should_not_find == True:
+        assert_equal(expected, { })
+    num_matched = 0
+    for item in object_array:
+        all_match = True
+        for key,value in to_match.items():
+            if item[key] != value:
+                all_match = False
+        if not all_match:
+            continue
+        elif should_not_find == True:
+            num_matched = num_matched+1
+        for key,value in expected.items():
+            if item[key] != value:
+                raise AssertionError("%s : expected %s=%s"%(str(item), str(key), str(value)))
+            num_matched = num_matched+1
+    if num_matched == 0 and should_not_find != True:
+        raise AssertionError("No objects matched %s"%(str(to_match)))
+    if num_matched > 0 and should_not_find == True:
+        raise AssertionError("Objects were found %s"%(str(to_match)))
+
+def assert_raises_rpc_error(code, message, fun, *args, **kwds):
+    """Run an RPC and verify that a specific JSONRPC exception code and message is raised.
+    Calls function `fun` with arguments `args` and `kwds`. Catches a JSONRPCException
+    and verifies that the error code and message are as expected. Throws AssertionError if
+    no JSONRPCException was raised or if the error code/message are not as expected.
+    Args:
+        code (int), optional: the error code returned by the RPC call (defined
+            in src/rpc/protocol.h). Set to None if checking the error code is not required.
+        message (string), optional: [a substring of] the error string returned by the
+            RPC call. Set to None if checking the error string is not required.
+        fun (function): the function to call. This should be the name of an RPC.
+        args*: positional arguments for the function.
+        kwds**: named arguments for the function.
+    """
+    assert try_rpc(code, message, fun, *args, **kwds), "No exception raised"
+
+def try_rpc(code, message, fun, *args, **kwds):
+    """Tries to run an rpc command.
+    Test against error code and message if the rpc fails.
+    Returns whether a JSONRPCException was raised."""
+    try:
+        fun(*args, **kwds)
+    except JSONRPCException as e:
+        # JSONRPCException was thrown as expected. Check the code and message values are correct.
+        if (code is not None) and (code != e.error["code"]):
+            raise AssertionError("Unexpected JSONRPC error code %i" % e.error["code"])
+        if (message is not None) and (message not in e.error['message']):
+            raise AssertionError("Expected substring not found:" + e.error['message'])
+        return True
+    except Exception as e:
+        raise AssertionError("Unexpected exception raised: " + type(e).__name__)
+    else:
+        return False
+
+def satoshi_round(amount):
+    return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
+
+# Helper to create at least "count" utxos
+# Pass in a fee that is sufficient for relay and mining new transactions.
+def create_confirmed_utxos(fee, node, count):
+    node.generate(int(0.5*count)+101)
+    utxos = node.listunspent()
+    iterations = count - len(utxos)
+    addr1 = node.getnewaddress()
+    addr2 = node.getnewaddress()
+    if iterations <= 0:
+        return utxos
+    for i in range(iterations):
+        t = utxos.pop()
+        inputs = []
+        inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
+        outputs = {}
+        send_value = t['amount'] - fee
+        outputs[addr1] = satoshi_round(send_value/2)
+        outputs[addr2] = satoshi_round(send_value/2)
+        raw_tx = node.createrawtransaction(inputs, outputs)
+        signed_tx = node.signrawtransaction(raw_tx)["hex"]
+        txid = node.sendrawtransaction(signed_tx)
+
+    while (node.getmempoolinfo()['size'] > 0):
+        node.generate(1)
+
+    utxos = node.listunspent()
+    assert(len(utxos) >= count)
+    return utxos
+
+# Create large OP_RETURN txouts that can be appended to a transaction
+# to make it large (helper for constructing large transactions).
+def gen_return_txouts():
+    # Some pre-processing to create a bunch of OP_RETURN txouts to insert into transactions we create
+    # So we have big transactions (and therefore can't fit very many into each block)
+    # create one script_pubkey
+    script_pubkey = "6a4d0200" #OP_RETURN OP_PUSH2 512 bytes
+    for i in range (512):
+        script_pubkey = script_pubkey + "01"
+    # concatenate 128 txouts of above script_pubkey which we'll insert before the txout for change
+    txouts = "81"
+    for k in range(128):
+        # add txout value
+        txouts = txouts + "0000000000000000"
+        # add length of script_pubkey
+        txouts = txouts + "fd0402"
+        # add script_pubkey
+        txouts = txouts + script_pubkey
+    return txouts
+
+def create_tx(node, coinbase, to_address, amount):
+    inputs = [{ "txid" : coinbase, "vout" : 0}]
+    outputs = { to_address : amount }
+    rawtx = node.createrawtransaction(inputs, outputs)
+    signresult = node.signrawtransaction(rawtx)
+    assert_equal(signresult["complete"], True)
+    return signresult["hex"]
+
+# Create a spend of each passed-in utxo, splicing in "txouts" to each raw
+# transaction to make it large.  See gen_return_txouts() above.
+def create_lots_of_big_transactions(node, txouts, utxos, fee):
+    addr = node.getnewaddress()
+    txids = []
+    for i in range(len(utxos)):
+        t = utxos.pop()
+        inputs = []
+        inputs.append({ "txid" : t["txid"], "vout" : t["vout"]})
+        outputs = {}
+        send_value = t['amount'] - fee
+        outputs[addr] = satoshi_round(send_value)
+        rawtx = node.createrawtransaction(inputs, outputs)
+        newtx = rawtx[0:92]
+        newtx = newtx + txouts
+        newtx = newtx + rawtx[94:]
+        signresult = node.signrawtransaction(newtx, None, None, "NONE")
+        txid = node.sendrawtransaction(signresult["hex"], True)
+        txids.append(txid)
+    return txids
+
+def get_bip9_status(node, key):
+    info = node.getblockchaininfo()
+    return info['bip9_softforks'][key]
+
+
+def slow_gen(node, count, sleep = 0.1):
+    total = count
+    blocks = []
+    while total > 0:
+        now = min(total, 10)
+        blocks.extend(node.generate(now))
+        total -= now
+        time.sleep(sleep)
+    return blocks

basicswap/interface/contrib/pivx_test_framework/messages.py

@@ -51,9 +51,6 @@ MSG_TYPE_MASK = 0xffffffff >> 2
 def sha256(s):
     return hashlib.new('sha256', s).digest()
 
-def ripemd160(s):
-    return hashlib.new('ripemd160', s).digest()
-
 def hash256(s):
     return sha256(sha256(s))
 
@@ -184,11 +181,18 @@ def ser_string_vector(l):
     return r
 
 
+# Deserialize from bytes
+def FromBytes(obj, tx_bytes):
+    obj.deserialize(BytesIO(tx_bytes))
+    return obj
+
+
 # Deserialize from a hex string representation (eg from RPC)
 def FromHex(obj, hex_string):
     obj.deserialize(BytesIO(hex_str_to_bytes(hex_string)))
     return obj
 
+
 # Convert a binary-serializable object to hex (eg for submission via RPC)
 def ToHex(obj):
     return bytes_to_hex_str(obj.serialize())
@@ -418,43 +422,114 @@ class CTxOut:
                bytes_to_hex_str(self.scriptPubKey))
 
 
+class SpendDescription:
+    def deserialize(self, f):
+        self.cv = deser_uint256(f)
+        self.anchor = deser_uint256(f)
+        self.nullifier = deser_uint256(f)
+        self.rk = deser_uint256(f)
+        self.zkproof = f.read(192)
+        self.spendAuthSig = f.read(64)
+
+    def serialize(self):
+        r = b""
+        r += ser_uint256(self.cv)
+        r += ser_uint256(self.anchor)
+        r += ser_uint256(self.nullifier)
+        r += ser_uint256(self.rk)
+        r += self.zkproof
+        r += self.spendAuthSig
+        return r
+
+
+class OutputDescription:
+    def deserialize(self, f):
+        self.cv = deser_uint256(f)
+        self.cmu = deser_uint256(f)
+        self.ephemeralKey = deser_uint256(f)
+        self.encCiphertext = f.read(580)
+        self.outCiphertext = f.read(80)
+        self.zkproof = f.read(192)
+
+    def serialize(self):
+        r = b""
+        r += ser_uint256(self.cv)
+        r += ser_uint256(self.cmu)
+        r += ser_uint256(self.ephemeralKey)
+        r += self.encCiphertext
+        r += self.outCiphertext
+        r += self.zkproof
+        return r
+
+
+class SaplingTxData:
+    def deserialize(self, f):
+        self.pre = f.read(1)
+        self.valueBalance = struct.unpack("<q", f.read(8))[0]
+
+        self.vShieldedSpend = deser_vector(f, SpendDescription)
+        self.vShieldedOutput = deser_vector(f, OutputDescription)
+
+        self.bindingSig = f.read(64)
+
+    def serialize(self):
+        r = b""
+        r += self.pre
+        r += struct.pack("<q", self.valueBalance)
+        r += ser_vector(self.vShieldedSpend)
+        r += ser_vector(self.vShieldedOutput)
+        r += self.bindingSig
+        return r
+
+
 class CTransaction:
     def __init__(self, tx=None):
         if tx is None:
             self.nVersion = 1
+            self.nType = 0
             self.vin = []
             self.vout = []
-            self.sapData = b""
+            self.sapData = None
+            self.extraData = b""
             self.nLockTime = 0
             self.sha256 = None
             self.hash = None
         else:
             self.nVersion = tx.nVersion
+            self.nType = tx.nType
             self.vin = copy.deepcopy(tx.vin)
             self.vout = copy.deepcopy(tx.vout)
             self.nLockTime = tx.nLockTime
             self.sapData = tx.sapData
+            self.extraData = tx.extraData
             self.sha256 = tx.sha256
             self.hash = tx.hash
 
     def deserialize(self, f):
-        self.nVersion = struct.unpack("<i", f.read(4))[0]
+        self.nVersion = struct.unpack("<h", f.read(2))[0]
+        self.nType = struct.unpack("<h", f.read(2))[0]
         self.vin = deser_vector(f, CTxIn)
         self.vout = deser_vector(f, CTxOut)
         self.nLockTime = struct.unpack("<I", f.read(4))[0]
-        if self.nVersion >= 2:
+        if self.nVersion >= 3:
-            self.sapData = deser_string(f)
+            self.sapData = SaplingTxData()
+            self.sapData.deserialize(f)
+            if self.nType != 0:
+                self.extraData = deser_string(f)
         self.sha256 = None
         self.hash = None
 
     def serialize_without_witness(self):
         r = b""
-        r += struct.pack("<i", self.nVersion)
+        r += struct.pack("<h", self.nVersion)
+        r += struct.pack("<h", self.nType)
         r += ser_vector(self.vin)
         r += ser_vector(self.vout)
         r += struct.pack("<I", self.nLockTime)
-        if self.nVersion >= 2:
+        if self.nVersion >= 3:
-            r += ser_string(self.sapData)
+            r += self.sapData.serialize()
+            if self.nType != 0:
+                r += ser_string(self.extraData)
         return r
 
     # Regular serialization is with witness -- must explicitly
@@ -504,8 +579,8 @@ class CTransaction:
                     x.prevout.hash == outpoint.hash and x.prevout.n == outpoint.n]) > 0
 
     def __repr__(self):
-        return "CTransaction(nVersion=%i vin=%s vout=%s nLockTime=%i)" \
+        return "CTransaction(nVersion=%i nType=%i vin=%s vout=%s nLockTime=%i)" \
-            % (self.nVersion, repr(self.vin), repr(self.vout), self.nLockTime)
+            % (self.nVersion, self.nType, repr(self.vin), repr(self.vout), self.nLockTime)
 
 
 class CBlockHeader:

basicswap/interface/dash.py

@@ -7,7 +7,12 @@
 
 from .btc import BTCInterface
 from basicswap.chainparams import Coins
+from basicswap.util.address import decodeAddress
 from mnemonic import Mnemonic
+from basicswap.contrib.test_framework.script import (
+    CScript,
+    OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG
+)
 
 
 class DASHInterface(BTCInterface):
@@ -15,20 +20,75 @@ class DASHInterface(BTCInterface):
     def coin_type():
         return Coins.DASH
 
-    def initialiseWallet(self, key):
+    def __init__(self, coin_settings, network, swap_client=None):
-        words = Mnemonic('english').to_mnemonic(key)
+        super().__init__(coin_settings, network, swap_client)
-        self.rpc_callback('upgradetohd', [words, ])
+        self._wallet_passphrase = ''
+        self._have_checked_seed = False
 
-    def checkExpectedSeed(self, key_hash):
+    def seedToMnemonic(self, key: bytes) -> str:
+        return Mnemonic('english').to_mnemonic(key)
+
+    def initialiseWallet(self, key: bytes):
+        words = self.seedToMnemonic(key)
+
+        mnemonic_passphrase = ''
+        self.rpc_wallet('upgradetohd', [words, mnemonic_passphrase, self._wallet_passphrase])
+        self._have_checked_seed = False
+        if self._wallet_passphrase != '':
+            self.unlockWallet(self._wallet_passphrase)
+
+    def decodeAddress(self, address: str) -> bytes:
+        return decodeAddress(address)[1:]
+
+    def checkExpectedSeed(self, key_hash: str):
         try:
-            rv = self.rpc_callback('dumphdinfo')
+            rv = self.rpc_wallet('dumphdinfo')
             entropy = Mnemonic('english').to_entropy(rv['mnemonic'].split(' '))
             entropy_hash = self.getAddressHashFromKey(entropy)[::-1].hex()
+            self._have_checked_seed = True
             return entropy_hash == key_hash
         except Exception as e:
             self._log.warning('checkExpectedSeed failed: {}'.format(str(e)))
         return False
 
     def withdrawCoin(self, value, addr_to, subfee):
-        params = [addr_to, value, '', '', subfee]
+        params = [addr_to, value, '', '', subfee, False, False, self._conf_target]
-        return self.rpc_callback('sendtoaddress', params)
+        return self.rpc_wallet('sendtoaddress', params)
+
+    def getSpendableBalance(self) -> int:
+        return self.make_int(self.rpc_wallet('getwalletinfo')['balance'])
+
+    def getScriptForPubkeyHash(self, pkh: bytes) -> bytearray:
+        # Return P2PKH
+        return CScript([OP_DUP, OP_HASH160, pkh, OP_EQUALVERIFY, OP_CHECKSIG])
+
+    def getBLockSpendTxFee(self, tx, fee_rate: int) -> int:
+        add_bytes = 107
+        size = len(tx.serialize_with_witness()) + add_bytes
+        pay_fee = round(fee_rate * size / 1000)
+        self._log.info(f'BLockSpendTx  fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
+        return pay_fee
+
+    def findTxnByHash(self, txid_hex: str):
+        # Only works for wallet txns
+        try:
+            rv = self.rpc_wallet('gettransaction', [txid_hex])
+        except Exception as ex:
+            self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
+            return None
+        if 'confirmations' in rv and rv['confirmations'] >= self.blocks_confirmed:
+            block_height = self.getBlockHeader(rv['blockhash'])['height']
+            return {'txid': txid_hex, 'amount': 0, 'height': block_height}
+
+        return None
+
+    def unlockWallet(self, password: str):
+        super().unlockWallet(password)
+        # Store password for initialiseWallet
+        self._wallet_passphrase = password
+        if not self._have_checked_seed:
+            self._sc.checkWalletSeed(self.coin_type())
+
+    def lockWallet(self):
+        super().lockWallet()
+        self._wallet_passphrase = ''

basicswap/interface/firo.py

@@ -0,0 +1,367 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022-2023 tecnovert
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+import random
+import hashlib
+
+from .btc import BTCInterface, find_vout_for_address_from_txobj
+from basicswap.util import (
+    i2b,
+    ensure,
+)
+from basicswap.rpc import make_rpc_func
+from basicswap.util.crypto import hash160
+from basicswap.util.address import decodeAddress
+from basicswap.chainparams import Coins
+from basicswap.interface.contrib.firo_test_framework.script import (
+    CScript,
+    OP_DUP,
+    OP_EQUAL,
+    OP_HASH160,
+    OP_CHECKSIG,
+    OP_EQUALVERIFY,
+)
+from basicswap.interface.contrib.firo_test_framework.mininode import (
+    CBlock,
+    FromHex,
+    CTransaction,
+)
+
+
+class FIROInterface(BTCInterface):
+    @staticmethod
+    def coin_type():
+        return Coins.FIRO
+
+    def __init__(self, coin_settings, network, swap_client=None):
+        super(FIROInterface, self).__init__(coin_settings, network, swap_client)
+        # 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'
+
+    def initialiseWallet(self, key):
+        # load with -hdseed= parameter
+        pass
+
+    def getNewAddress(self, use_segwit, label='swap_receive'):
+        return self.rpc('getnewaddress', [label])
+        # addr_plain = self.rpc('getnewaddress', [label])
+        # return self.rpc('addwitnessaddress', [addr_plain])
+
+    def decodeAddress(self, address):
+        return decodeAddress(address)[1:]
+
+    def encodeSegwitAddress(self, script):
+        raise ValueError('TODO')
+
+    def decodeSegwitAddress(self, addr):
+        raise ValueError('TODO')
+
+    def isWatchOnlyAddress(self, address):
+        addr_info = self.rpc('validateaddress', [address])
+        return addr_info['iswatchonly']
+
+    def isAddressMine(self, address: str, or_watch_only: bool = False) -> bool:
+        addr_info = self.rpc('validateaddress', [address])
+        if not or_watch_only:
+            return addr_info['ismine']
+        return addr_info['ismine'] or addr_info['iswatchonly']
+
+    def getSCLockScriptAddress(self, lock_script):
+        lock_tx_dest = self.getScriptDest(lock_script)
+        address = self.encodeScriptDest(lock_tx_dest)
+
+        if not self.isAddressMine(address, or_watch_only=True):
+            # Expects P2WSH nested in BIP16_P2SH
+            ro = self.rpc('importaddress', [lock_tx_dest.hex(), 'bid lock', False, True])
+            addr_info = self.rpc('validateaddress', [address])
+
+        return address
+
+    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False):
+        # Add watchonly address and rescan if required
+
+        if not self.isAddressMine(dest_address, or_watch_only=True):
+            self.importWatchOnlyAddress(dest_address, 'bid')
+            self._log.info('Imported watch-only addr: {}'.format(dest_address))
+            self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), rescan_from))
+            self.rescanBlockchainForAddress(rescan_from, dest_address)
+
+        return_txid = True if txid is None else False
+        if txid is None:
+            txns = self.rpc('listunspent', [0, 9999999, [dest_address, ]])
+
+            for tx in txns:
+                if self.make_int(tx['amount']) == bid_amount:
+                    txid = bytes.fromhex(tx['txid'])
+                    break
+
+        if txid is None:
+            return None
+
+        try:
+            tx = self.rpc('gettransaction', [txid.hex()])
+
+            block_height = 0
+            if 'blockhash' in tx:
+                block_header = self.rpc('getblockheader', [tx['blockhash']])
+                block_height = block_header['height']
+
+            rv = {
+                'depth': 0 if 'confirmations' not in tx else tx['confirmations'],
+                'height': block_height}
+
+        except Exception as e:
+            self._log.debug('getLockTxHeight gettransaction failed: %s, %s', txid.hex(), str(e))
+            return None
+
+        if find_index:
+            tx_obj = self.rpc('decoderawtransaction', [tx['hex']])
+            rv['index'] = find_vout_for_address_from_txobj(tx_obj, dest_address)
+
+        if return_txid:
+            rv['txid'] = txid.hex()
+
+        return rv
+
+    def createSCLockTx(self, value: int, script: bytearray, vkbv: bytes = None) -> bytes:
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.vout.append(self.txoType()(value, self.getScriptDest(script)))
+
+        return tx.serialize()
+
+    def fundSCLockTx(self, tx_bytes, feerate, vkbv=None):
+        return self.fundTx(tx_bytes, feerate)
+
+    def signTxWithWallet(self, tx):
+        rv = self.rpc('signrawtransaction', [tx.hex()])
+        return bytes.fromhex(rv['hex'])
+
+    def createRawFundedTransaction(self, addr_to: str, amount: int, sub_fee: bool = False, lock_unspents: bool = True) -> str:
+        txn = self.rpc('createrawtransaction', [[], {addr_to: self.format_amount(amount)}])
+        fee_rate, fee_src = self.get_fee_rate(self._conf_target)
+        self._log.debug(f'Fee rate: {fee_rate}, source: {fee_src}, block target: {self._conf_target}')
+        options = {
+            'lockUnspents': lock_unspents,
+            'feeRate': fee_rate,
+        }
+        if sub_fee:
+            options['subtractFeeFromOutputs'] = [0,]
+        return self.rpc('fundrawtransaction', [txn, options])['hex']
+
+    def createRawSignedTransaction(self, addr_to, amount) -> str:
+        txn_funded = self.createRawFundedTransaction(addr_to, amount)
+        return self.rpc('signrawtransaction', [txn_funded])['hex']
+
+    def getScriptForPubkeyHash(self, pkh: bytes) -> bytearray:
+        # Return P2PKH
+        return CScript([OP_DUP, OP_HASH160, pkh, OP_EQUALVERIFY, OP_CHECKSIG])
+
+    def getScriptDest(self, script: bytearray) -> bytearray:
+        # P2SH
+
+        script_hash = hash160(script)
+        assert len(script_hash) == 20
+
+        return CScript([OP_HASH160, script_hash, OP_EQUAL])
+
+    def getSeedHash(self, seed: bytes) -> bytes:
+        return hash160(seed)[::-1]
+
+    def encodeScriptDest(self, script_dest: bytes) -> str:
+        # Extract hash from script
+        script_hash = script_dest[2:-1]
+        return self.sh_to_address(script_hash)
+
+    def getDestForScriptHash(self, script_hash):
+        assert len(script_hash) == 20
+        return CScript([OP_HASH160, script_hash, OP_EQUAL])
+
+    def withdrawCoin(self, value, addr_to, subfee):
+        params = [addr_to, value, '', '', subfee]
+        return self.rpc('sendtoaddress', params)
+
+    def getWalletSeedID(self):
+        return self.rpc('getwalletinfo')['hdmasterkeyid']
+
+    def getSpendableBalance(self) -> int:
+        return self.make_int(self.rpc('getwalletinfo')['balance'])
+
+    def getBLockSpendTxFee(self, tx, fee_rate: int) -> int:
+        add_bytes = 107
+        size = len(tx.serialize_with_witness()) + add_bytes
+        pay_fee = round(fee_rate * size / 1000)
+        self._log.info(f'BLockSpendTx  fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
+        return pay_fee
+
+    def signTxWithKey(self, tx: bytes, key: bytes) -> bytes:
+        key_wif = self.encodeKey(key)
+        rv = self.rpc('signrawtransaction', [tx.hex(), [], [key_wif, ]])
+        return bytes.fromhex(rv['hex'])
+
+    def findTxnByHash(self, txid_hex: str):
+        # Only works for wallet txns
+        try:
+            rv = self.rpc('gettransaction', [txid_hex])
+        except Exception as ex:
+            self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
+            return None
+        if 'confirmations' in rv and rv['confirmations'] >= self.blocks_confirmed:
+            block_height = self.getBlockHeader(rv['blockhash'])['height']
+            return {'txid': txid_hex, 'amount': 0, 'height': block_height}
+        return None
+
+    def getProofOfFunds(self, amount_for, extra_commit_bytes):
+        # TODO: Lock unspent and use same output/s to fund bid
+
+        unspents_by_addr = dict()
+        unspents = self.rpc('listunspent')
+        for u in unspents:
+            if u['spendable'] is not True:
+                continue
+            if u['address'] not in unspents_by_addr:
+                unspents_by_addr[u['address']] = {'total': 0, 'utxos': []}
+            utxo_amount: int = self.make_int(u['amount'], r=1)
+            unspents_by_addr[u['address']]['total'] += utxo_amount
+            unspents_by_addr[u['address']]['utxos'].append((utxo_amount, u['txid'], u['vout']))
+
+        max_utxos: int = 4
+
+        viable_addrs = []
+        for addr, data in unspents_by_addr.items():
+            if data['total'] >= amount_for:
+                # Sort from largest to smallest amount
+                sorted_utxos = sorted(data['utxos'], key=lambda x: x[0])
+
+                # Max outputs required to reach amount_for
+                utxos_req: int = 0
+                sum_value: int = 0
+                for utxo in sorted_utxos:
+                    sum_value += utxo[0]
+                    utxos_req += 1
+                    if sum_value >= amount_for:
+                        break
+
+                if utxos_req <= max_utxos:
+                    viable_addrs.append(addr)
+                    continue
+
+        ensure(len(viable_addrs) > 0, 'Could not find address with enough funds for proof')
+
+        sign_for_addr: str = random.choice(viable_addrs)
+        self._log.debug('sign_for_addr %s', sign_for_addr)
+
+        prove_utxos = []
+        sorted_utxos = sorted(unspents_by_addr[sign_for_addr]['utxos'], key=lambda x: x[0])
+
+        hasher = hashlib.sha256()
+
+        sum_value: int = 0
+        for utxo in sorted_utxos:
+            sum_value += utxo[0]
+            outpoint = (bytes.fromhex(utxo[1]), utxo[2])
+            prove_utxos.append(outpoint)
+            hasher.update(outpoint[0])
+            hasher.update(outpoint[1].to_bytes(2, 'big'))
+            if sum_value >= amount_for:
+                break
+        utxos_hash = hasher.digest()
+
+        self._log.debug('sign_for_addr %s', sign_for_addr)
+
+        if self.using_segwit():  # TODO: Use isSegwitAddress when scantxoutset can use combo
+            # 'Address does not refer to key' for non p2pkh
+            pkh = self.decodeAddress(sign_for_addr)
+            sign_for_addr = self.pkh_to_address(pkh)
+            self._log.debug('sign_for_addr converted %s', sign_for_addr)
+
+        signature = self.rpc('signmessage', [sign_for_addr, sign_for_addr + '_swap_proof_' + utxos_hash.hex() + extra_commit_bytes.hex()])
+
+        return (sign_for_addr, signature, prove_utxos)
+
+    def verifyProofOfFunds(self, address, signature, utxos, extra_commit_bytes):
+        hasher = hashlib.sha256()
+        sum_value: int = 0
+        for outpoint in utxos:
+            hasher.update(outpoint[0])
+            hasher.update(outpoint[1].to_bytes(2, 'big'))
+        utxos_hash = hasher.digest()
+
+        passed = self.verifyMessage(address, address + '_swap_proof_' + utxos_hash.hex() + extra_commit_bytes.hex(), signature)
+        ensure(passed is True, 'Proof of funds signature invalid')
+
+        if self.using_segwit():
+            address = self.encodeSegwitAddress(decodeAddress(address)[1:])
+
+        sum_value: int = 0
+        for outpoint in utxos:
+            txout = self.rpc('gettxout', [outpoint[0].hex(), outpoint[1]])
+            sum_value += self.make_int(txout['value'])
+
+        return sum_value
+
+    def rescanBlockchainForAddress(self, height_start: int, addr_find: str):
+        # Very ugly workaround for missing `rescanblockchain` rpc command
+
+        chain_blocks: int = self.getChainHeight()
+
+        current_height: int = chain_blocks
+        block_hash = self.rpc('getblockhash', [current_height])
+
+        script_hash: bytes = self.decodeAddress(addr_find)
+        find_scriptPubKey = self.getDestForScriptHash(script_hash)
+
+        while current_height > height_start:
+            block_hash = self.rpc('getblockhash', [current_height])
+
+            block = self.rpc('getblock', [block_hash, False])
+            decoded_block = CBlock()
+            decoded_block = FromHex(decoded_block, block)
+            for tx in decoded_block.vtx:
+                for txo in tx.vout:
+                    if txo.scriptPubKey == find_scriptPubKey:
+                        tx.rehash()
+                        txid = i2b(tx.sha256)
+                        self._log.info('Found output to addr: {} in tx {} in block {}'.format(addr_find, txid.hex(), block_hash))
+                        self._log.info('rescanblockchain hack invalidateblock {}'.format(block_hash))
+                        self.rpc('invalidateblock', [block_hash])
+                        self.rpc('reconsiderblock', [block_hash])
+                        return
+            current_height -= 1
+
+    def getBlockWithTxns(self, block_hash):
+        # TODO: Bypass decoderawtransaction and getblockheader
+        block = self.rpc('getblock', [block_hash, False])
+        block_header = self.rpc('getblockheader', [block_hash])
+        decoded_block = CBlock()
+        decoded_block = FromHex(decoded_block, block)
+
+        tx_rv = []
+        for tx in decoded_block.vtx:
+            tx_hex = tx.serialize_with_witness().hex()
+            tx_dec = self.rpc('decoderawtransaction', [tx_hex])
+            if 'hex' not in tx_dec:
+                tx_dec['hex'] = tx_hex
+
+            tx_rv.append(tx_dec)
+
+        block_rv = {
+            'hash': block_hash,
+            'tx': tx_rv,
+            'confirmations': block_header['confirmations'],
+            'height': block_header['height'],
+            'version': block_header['version'],
+            'merkleroot': block_header['merkleroot'],
+        }
+
+        return block_rv

basicswap/interface/ltc.py

@@ -1,15 +1,122 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
 from .btc import BTCInterface
-from basicswap.chainparams import Coins
+from basicswap.rpc import make_rpc_func
+from basicswap.chainparams import Coins, chainparams
 
 
 class LTCInterface(BTCInterface):
     @staticmethod
     def coin_type():
         return Coins.LTC
+
+    def __init__(self, coin_settings, network, swap_client=None):
+        super(LTCInterface, self).__init__(coin_settings, network, swap_client)
+        self._rpc_wallet_mweb = 'mweb'
+        self.rpc_wallet_mweb = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host, wallet=self._rpc_wallet_mweb)
+
+    def getNewMwebAddress(self, use_segwit=False, label='swap_receive') -> str:
+        return self.rpc_wallet_mweb('getnewaddress', [label, 'mweb'])
+
+    def getNewStealthAddress(self, label=''):
+        return self.getNewMwebAddress(False, label)
+
+    def withdrawCoin(self, value, type_from: str, addr_to: str, subfee: bool) -> str:
+        params = [addr_to, value, '', '', subfee, True, self._conf_target]
+        if type_from == 'mweb':
+            return self.rpc_wallet_mweb('sendtoaddress', params)
+        return self.rpc_wallet('sendtoaddress', params)
+
+    def getWalletInfo(self):
+        rv = super(LTCInterface, self).getWalletInfo()
+
+        mweb_info = self.rpc_wallet_mweb('getwalletinfo')
+        rv['mweb_balance'] = mweb_info['balance']
+        rv['mweb_unconfirmed'] = mweb_info['unconfirmed_balance']
+        rv['mweb_immature'] = mweb_info['immature_balance']
+
+        # Add unconfirmed mweb -> plain txns to the unconfirmed_balance
+        txns = self.rpc_wallet('listtransactions')
+        for tx in reversed(txns):
+            amount: float = tx.get('amount', 0.0)
+            if tx['confirmations'] == 0 and tx.get('mweb_out', None) and amount > 0.0:
+                rv['unconfirmed_balance'] += amount
+        return rv
+
+
+class LTCInterfaceMWEB(LTCInterface):
+    @staticmethod
+    def coin_type():
+        return Coins.LTC_MWEB
+
+    def __init__(self, coin_settings, network, swap_client=None):
+        super(LTCInterfaceMWEB, self).__init__(coin_settings, network, swap_client)
+        self._rpc_wallet = 'mweb'
+        self.rpc_wallet = make_rpc_func(self._rpcport, self._rpcauth, host=self._rpc_host, wallet=self._rpc_wallet)
+
+    def chainparams(self):
+        return chainparams[Coins.LTC]
+
+    def chainparams_network(self):
+        return chainparams[Coins.LTC][self._network]
+
+    def coin_name(self) -> str:
+        coin_chainparams = chainparams[Coins.LTC]
+        if coin_chainparams.get('use_ticker_as_name', False):
+            return coin_chainparams['ticker'] + ' MWEB'
+        return coin_chainparams['name'].capitalize() + ' MWEB'
+
+    def ticker(self) -> str:
+        ticker = chainparams[Coins.LTC]['ticker']
+        if self._network == 'testnet':
+            ticker = 't' + ticker
+        elif self._network == 'regtest':
+            ticker = 'rt' + ticker
+        return ticker + '_MWEB'
+
+    def getNewAddress(self, use_segwit=False, label='swap_receive') -> str:
+        return self.getNewMwebAddress()
+
+    def has_mweb_wallet(self) -> bool:
+        return 'mweb' in self.rpc('listwallets')
+
+    def init_wallet(self, password=None):
+        # If system is encrypted mweb wallet will be created at first unlock
+
+        self._log.info('init_wallet - {}'.format(self.ticker()))
+
+        self._log.info('Creating mweb wallet for {}.'.format(self.coin_name()))
+        # wallet_name, disable_private_keys, blank, passphrase, avoid_reuse, descriptors, load_on_startup
+        self.rpc('createwallet', ['mweb', False, True, password, False, False, True])
+
+        if password is not None:
+            # Max timeout value, ~3 years
+            self.rpc_wallet('walletpassphrase', [password, 100000000])
+
+        if self.getWalletSeedID() == 'Not found':
+            self._sc.initialiseWallet(self.coin_type())
+
+            # Workaround to trigger mweb_spk_man->LoadMWEBKeychain()
+            self.rpc('unloadwallet', ['mweb'])
+            self.rpc('loadwallet', ['mweb'])
+            if password is not None:
+                self.rpc_wallet('walletpassphrase', [password, 100000000])
+            self.rpc_wallet('keypoolrefill')
+
+    def unlockWallet(self, password: str):
+        if password == '':
+            return
+        self._log.info('unlockWallet - {}'.format(self.ticker()))
+
+        if not self.has_mweb_wallet():
+            self.init_wallet(password)
+        else:
+            # Max timeout value, ~3 years
+            self.rpc_wallet('walletpassphrase', [password, 100000000])
+
+        self._sc.checkWalletSeed(self.coin_type())

basicswap/interface/nav.py

@@ -0,0 +1,738 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2023 tecnovert
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+import random
+import hashlib
+
+from io import BytesIO
+from coincurve.keys import (
+    PublicKey,
+    PrivateKey,
+)
+from .btc import BTCInterface, find_vout_for_address_from_txobj, findOutput
+from basicswap.rpc import make_rpc_func
+from basicswap.chainparams import Coins
+from basicswap.interface.contrib.nav_test_framework.mininode import (
+    CTxIn,
+    CTxOut,
+    CBlock,
+    COutPoint,
+    CTransaction,
+    CTxInWitness,
+    FromHex,
+    uint256_from_str,
+)
+from basicswap.util.crypto import hash160
+from basicswap.util.address import (
+    decodeWif,
+    pubkeyToAddress,
+    encodeAddress,
+)
+from basicswap.util import (
+    i2b, i2h,
+    ensure,
+)
+from basicswap.basicswap_util import (
+    getVoutByScriptPubKey,
+)
+
+from basicswap.interface.contrib.nav_test_framework.script import (
+    CScript,
+    OP_0,
+    OP_EQUAL,
+    OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG,
+    SIGHASH_ALL,
+    SegwitVersion1SignatureHash,
+)
+from mnemonic import Mnemonic
+
+
+class NAVInterface(BTCInterface):
+    @staticmethod
+    def coin_type():
+        return Coins.NAV
+
+    @staticmethod
+    def txVersion() -> int:
+        return 3
+
+    @staticmethod
+    def txoType():
+        return CTxOut
+
+    def __init__(self, coin_settings, network, swap_client=None):
+        super(NAVInterface, self).__init__(coin_settings, network, swap_client)
+        # 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
+
+    def seedToMnemonic(self, key):
+        return Mnemonic('english').to_mnemonic(key)
+
+    def initialiseWallet(self, key):
+        # load with -importmnemonic= parameter
+        pass
+
+    def getWalletSeedID(self):
+        return self.rpc('getwalletinfo')['hdmasterkeyid']
+
+    def withdrawCoin(self, value, addr_to: str, subfee: bool):
+        strdzeel = ''
+        params = [addr_to, value, '', '', strdzeel, subfee]
+        return self.rpc('sendtoaddress', params)
+
+    def getSpendableBalance(self) -> int:
+        return self.make_int(self.rpc('getwalletinfo')['balance'])
+
+    def signTxWithWallet(self, tx: bytes) -> bytes:
+        rv = self.rpc('signrawtransaction', [tx.hex()])
+
+        return bytes.fromhex(rv['hex'])
+
+    def checkExpectedSeed(self, key_hash: str):
+        try:
+            rv = self.rpc('dumpmnemonic')
+            entropy = Mnemonic('english').to_entropy(rv.split(' '))
+
+            entropy_hash = self.getAddressHashFromKey(entropy)[::-1].hex()
+            self._have_checked_seed = True
+            return entropy_hash == key_hash
+        except Exception as e:
+            self._log.warning('checkExpectedSeed failed: {}'.format(str(e)))
+        return False
+
+    def getScriptForP2PKH(self, pkh: bytes) -> bytearray:
+        # Return P2PKH
+        return CScript([OP_DUP, OP_HASH160, pkh, OP_EQUALVERIFY, OP_CHECKSIG])
+
+    def getScriptForPubkeyHash(self, pkh: bytes) -> bytearray:
+        # Return P2SH-p2wpkh
+
+        script = CScript([OP_0, pkh])
+        script_hash = hash160(script)
+        assert len(script_hash) == 20
+
+        return CScript([OP_HASH160, script_hash, OP_EQUAL])
+
+    def getInputScriptForPubkeyHash(self, pkh: bytes) -> bytearray:
+        script = CScript([OP_0, pkh])
+        return bytes((len(script),)) + script
+
+    def encodeSegwitAddress(self, pkh: bytes) -> str:
+        # P2SH-p2wpkh
+        script = CScript([OP_0, pkh])
+        script_hash = hash160(script)
+        assert len(script_hash) == 20
+        return encodeAddress(bytes((self.chainparams_network()['script_address'],)) + script_hash)
+
+    def encodeSegwitAddressScript(self, script: bytes) -> str:
+        if len(script) == 23 and script[0] == OP_HASH160 and script[1] == 20 and script[22] == OP_EQUAL:
+            script_hash = script[2:22]
+            return encodeAddress(bytes((self.chainparams_network()['script_address'],)) + script_hash)
+        raise ValueError('Unknown Script')
+
+    def loadTx(self, tx_bytes: bytes) -> CTransaction:
+        # Load tx from bytes to internal representation
+        tx = CTransaction()
+        tx.deserialize(BytesIO(tx_bytes))
+        return tx
+
+    def signTx(self, key_bytes: bytes, tx_bytes: bytes, input_n: int, prevout_script, prevout_value: int):
+        tx = self.loadTx(tx_bytes)
+        sig_hash = SegwitVersion1SignatureHash(prevout_script, tx, input_n, SIGHASH_ALL, prevout_value)
+        eck = PrivateKey(key_bytes)
+        return eck.sign(sig_hash, hasher=None) + bytes((SIGHASH_ALL,))
+
+    def setTxSignature(self, tx_bytes: bytes, stack) -> bytes:
+        tx = self.loadTx(tx_bytes)
+        tx.wit.vtxinwit.clear()
+        tx.wit.vtxinwit.append(CTxInWitness())
+        tx.wit.vtxinwit[0].scriptWitness.stack = stack
+        return tx.serialize_with_witness()
+
+    def getProofOfFunds(self, amount_for, extra_commit_bytes):
+        # TODO: Lock unspent and use same output/s to fund bid
+
+        unspents_by_addr = dict()
+        unspents = self.rpc('listunspent')
+        for u in unspents:
+            if u['spendable'] is not True:
+                continue
+            if u['address'] not in unspents_by_addr:
+                unspents_by_addr[u['address']] = {'total': 0, 'utxos': []}
+            utxo_amount: int = self.make_int(u['amount'], r=1)
+            unspents_by_addr[u['address']]['total'] += utxo_amount
+            unspents_by_addr[u['address']]['utxos'].append((utxo_amount, u['txid'], u['vout']))
+
+        max_utxos: int = 4
+
+        viable_addrs = []
+        for addr, data in unspents_by_addr.items():
+            if data['total'] >= amount_for:
+                # Sort from largest to smallest amount
+                sorted_utxos = sorted(data['utxos'], key=lambda x: x[0])
+
+                # Max outputs required to reach amount_for
+                utxos_req: int = 0
+                sum_value: int = 0
+                for utxo in sorted_utxos:
+                    sum_value += utxo[0]
+                    utxos_req += 1
+                    if sum_value >= amount_for:
+                        break
+
+                if utxos_req <= max_utxos:
+                    viable_addrs.append(addr)
+                    continue
+
+        ensure(len(viable_addrs) > 0, 'Could not find address with enough funds for proof')
+
+        sign_for_addr: str = random.choice(viable_addrs)
+        self._log.debug('sign_for_addr %s', sign_for_addr)
+
+        prove_utxos = []
+        sorted_utxos = sorted(unspents_by_addr[sign_for_addr]['utxos'], key=lambda x: x[0])
+
+        hasher = hashlib.sha256()
+
+        sum_value: int = 0
+        for utxo in sorted_utxos:
+            sum_value += utxo[0]
+            outpoint = (bytes.fromhex(utxo[1]), utxo[2])
+            prove_utxos.append(outpoint)
+            hasher.update(outpoint[0])
+            hasher.update(outpoint[1].to_bytes(2, 'big'))
+            if sum_value >= amount_for:
+                break
+        utxos_hash = hasher.digest()
+
+        self._log.debug('sign_for_addr %s', sign_for_addr)
+
+        if self.using_segwit():  # TODO: Use isSegwitAddress when scantxoutset can use combo
+            # 'Address does not refer to key' for non p2pkh
+            addr_info = self.rpc('validateaddress', [addr, ])
+            if 'isscript' in addr_info and addr_info['isscript'] and 'hex' in addr_info:
+                pkh = bytes.fromhex(addr_info['hex'])[2:]
+                sign_for_addr = self.pkh_to_address(pkh)
+                self._log.debug('sign_for_addr converted %s', sign_for_addr)
+
+        signature = self.rpc('signmessage', [sign_for_addr, sign_for_addr + '_swap_proof_' + utxos_hash.hex() + extra_commit_bytes.hex()])
+
+        return (sign_for_addr, signature, prove_utxos)
+
+    def verifyProofOfFunds(self, address, signature, utxos, extra_commit_bytes):
+        hasher = hashlib.sha256()
+        sum_value: int = 0
+        for outpoint in utxos:
+            hasher.update(outpoint[0])
+            hasher.update(outpoint[1].to_bytes(2, 'big'))
+        utxos_hash = hasher.digest()
+
+        passed = self.verifyMessage(address, address + '_swap_proof_' + utxos_hash.hex() + extra_commit_bytes.hex(), signature)
+        ensure(passed is True, 'Proof of funds signature invalid')
+
+        if self.using_segwit():
+            address = self.encodeSegwitAddress(self.decodeAddress(address)[1:])
+
+        sum_value: int = 0
+        for outpoint in utxos:
+            txout = self.rpc('gettxout', [outpoint[0].hex(), outpoint[1]])
+            sum_value += self.make_int(txout['value'])
+
+        return sum_value
+
+    def createRawFundedTransaction(self, addr_to: str, amount: int, sub_fee: bool = False, lock_unspents: bool = True) -> str:
+        txn = self.rpc('createrawtransaction', [[], {addr_to: self.format_amount(amount)}])
+        fee_rate, fee_src = self.get_fee_rate(self._conf_target)
+        self._log.debug(f'Fee rate: {fee_rate}, source: {fee_src}, block target: {self._conf_target}')
+        if sub_fee:
+            raise ValueError('Navcoin fundrawtransaction is missing the subtractFeeFromOutputs parameter')
+            # options['subtractFeeFromOutputs'] = [0,]
+
+        fee_rate = self.make_int(fee_rate, r=1)
+        return self.fundTx(txn, fee_rate, lock_unspents).hex()
+
+    def isAddressMine(self, address: str, or_watch_only: bool = False) -> bool:
+        addr_info = self.rpc('validateaddress', [address])
+        if not or_watch_only:
+            return addr_info['ismine']
+        return addr_info['ismine'] or addr_info['iswatchonly']
+
+    def createRawSignedTransaction(self, addr_to, amount) -> str:
+        txn_funded = self.createRawFundedTransaction(addr_to, amount)
+        return self.rpc('signrawtransaction', [txn_funded])['hex']
+
+    def getBlockchainInfo(self):
+        rv = self.rpc('getblockchaininfo')
+        synced = round(rv['verificationprogress'], 3)
+        if synced >= 0.997:
+            rv['verificationprogress'] = 1.0
+        return rv
+
+    def encodeScriptDest(self, script_dest: bytes) -> str:
+        script_hash = script_dest[2:-1]  # Extract hash from script
+        return self.sh_to_address(script_hash)
+
+    def encode_p2wsh(self, script: bytes) -> str:
+        return pubkeyToAddress(self.chainparams_network()['script_address'], script)
+
+    def find_prevout_info(self, txn_hex: str, txn_script: bytes):
+        txjs = self.rpc('decoderawtransaction', [txn_hex])
+        n = getVoutByScriptPubKey(txjs, self.getScriptDest(txn_script).hex())
+
+        return {
+            'txid': txjs['txid'],
+            'vout': n,
+            'scriptPubKey': txjs['vout'][n]['scriptPubKey']['hex'],
+            'redeemScript': txn_script.hex(),
+            'amount': txjs['vout'][n]['value']
+        }
+
+    def getNewAddress(self, use_segwit: bool, label: str = 'swap_receive') -> str:
+        address: str = self.rpc('getnewaddress', [label,])
+        if use_segwit:
+            return self.rpc('addwitnessaddress', [address,])
+        return address
+
+    def createRedeemTxn(self, prevout, output_addr: str, output_value: int, txn_script: bytes) -> str:
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        prev_txid = uint256_from_str(bytes.fromhex(prevout['txid'])[::-1])
+
+        tx.vin.append(CTxIn(COutPoint(prev_txid, prevout['vout']),
+                            scriptSig=self.getScriptScriptSig(txn_script)))
+        pkh = self.decodeAddress(output_addr)
+        script = self.getScriptForPubkeyHash(pkh)
+        tx.vout.append(self.txoType()(output_value, script))
+        tx.rehash()
+        return tx.serialize().hex()
+
+    def createRefundTxn(self, prevout, output_addr: str, output_value: int, locktime: int, sequence: int, txn_script: bytes) -> str:
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.nLockTime = locktime
+        prev_txid = uint256_from_str(bytes.fromhex(prevout['txid'])[::-1])
+        tx.vin.append(CTxIn(COutPoint(prev_txid, prevout['vout']),
+                            nSequence=sequence,
+                            scriptSig=self.getScriptScriptSig(txn_script)))
+        pkh = self.decodeAddress(output_addr)
+        script = self.getScriptForPubkeyHash(pkh)
+        tx.vout.append(self.txoType()(output_value, script))
+        tx.rehash()
+        return tx.serialize().hex()
+
+    def getTxSignature(self, tx_hex: str, prevout_data, key_wif: str) -> str:
+        key = decodeWif(key_wif)
+        redeem_script = bytes.fromhex(prevout_data['redeemScript'])
+        sig = self.signTx(key, bytes.fromhex(tx_hex), 0, redeem_script, self.make_int(prevout_data['amount']))
+
+        return sig.hex()
+
+    def verifyTxSig(self, tx_bytes: bytes, sig: bytes, K: bytes, input_n: int, prevout_script: bytes, prevout_value: int) -> bool:
+        tx = self.loadTx(tx_bytes)
+        sig_hash = SegwitVersion1SignatureHash(prevout_script, tx, input_n, SIGHASH_ALL, prevout_value)
+
+        pubkey = PublicKey(K)
+        return pubkey.verify(sig[: -1], sig_hash, hasher=None)  # Pop the hashtype byte
+
+    def verifyRawTransaction(self, tx_hex: str, prevouts):
+        # Only checks signature
+        # verifyrawtransaction
+        self._log.warning('NAV verifyRawTransaction only checks signature')
+        inputs_valid: bool = False
+        validscripts: int = 0
+
+        tx_bytes = bytes.fromhex(tx_hex)
+        tx = self.loadTx(bytes.fromhex(tx_hex))
+
+        signature = tx.wit.vtxinwit[0].scriptWitness.stack[0]
+        pubkey = tx.wit.vtxinwit[0].scriptWitness.stack[1]
+
+        input_n: int = 0
+        prevout_data = prevouts[input_n]
+        redeem_script = bytes.fromhex(prevout_data['redeemScript'])
+        prevout_value = self.make_int(prevout_data['amount'])
+
+        if self.verifyTxSig(tx_bytes, signature, pubkey, input_n, redeem_script, prevout_value):
+            validscripts += 1
+
+        # TODO: validate inputs
+        inputs_valid = True
+
+        return {
+            'inputs_valid': inputs_valid,
+            'validscripts': validscripts,
+        }
+
+    def getHTLCSpendTxVSize(self, redeem: bool = True) -> int:
+        tx_vsize = 5  # Add a few bytes, sequence in script takes variable amount of bytes
+
+        tx_vsize += 184 if redeem else 187
+        return tx_vsize
+
+    def getTxid(self, tx) -> bytes:
+        if isinstance(tx, str):
+            tx = bytes.fromhex(tx)
+        if isinstance(tx, bytes):
+            tx = self.loadTx(tx)
+        tx.rehash()
+        return i2b(tx.sha256)
+
+    def rescanBlockchainForAddress(self, height_start: int, addr_find: str):
+        # Very ugly workaround for missing `rescanblockchain` rpc command
+
+        chain_blocks: int = self.getChainHeight()
+
+        current_height: int = chain_blocks
+        block_hash = self.rpc('getblockhash', [current_height])
+
+        script_hash: bytes = self.decodeAddress(addr_find)
+        find_scriptPubKey = self.getDestForScriptHash(script_hash)
+
+        while current_height > height_start:
+            block_hash = self.rpc('getblockhash', [current_height])
+
+            block = self.rpc('getblock', [block_hash, False])
+            decoded_block = CBlock()
+            decoded_block = FromHex(decoded_block, block)
+            for tx in decoded_block.vtx:
+                for txo in tx.vout:
+                    if txo.scriptPubKey == find_scriptPubKey:
+                        tx.rehash()
+                        txid = i2b(tx.sha256)
+                        self._log.info('Found output to addr: {} in tx {} in block {}'.format(addr_find, txid.hex(), block_hash))
+                        self._log.info('rescanblockchain hack invalidateblock {}'.format(block_hash))
+                        self.rpc('invalidateblock', [block_hash])
+                        self.rpc('reconsiderblock', [block_hash])
+                        return
+            current_height -= 1
+
+    def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index: bool = False):
+        # Add watchonly address and rescan if required
+
+        if not self.isAddressMine(dest_address, or_watch_only=True):
+            self.importWatchOnlyAddress(dest_address, 'bid')
+            self._log.info('Imported watch-only addr: {}'.format(dest_address))
+            self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), rescan_from))
+            self.rescanBlockchainForAddress(rescan_from, dest_address)
+
+        return_txid = True if txid is None else False
+        if txid is None:
+            txns = self.rpc('listunspent', [0, 9999999, [dest_address, ]])
+
+            for tx in txns:
+                if self.make_int(tx['amount']) == bid_amount:
+                    txid = bytes.fromhex(tx['txid'])
+                    break
+
+        if txid is None:
+            return None
+
+        try:
+            tx = self.rpc('gettransaction', [txid.hex()])
+
+            block_height = 0
+            if 'blockhash' in tx:
+                block_header = self.rpc('getblockheader', [tx['blockhash']])
+                block_height = block_header['height']
+
+            rv = {
+                'depth': 0 if 'confirmations' not in tx else tx['confirmations'],
+                'height': block_height}
+
+        except Exception as e:
+            self._log.debug('getLockTxHeight gettransaction failed: %s, %s', txid.hex(), str(e))
+            return None
+
+        if find_index:
+            tx_obj = self.rpc('decoderawtransaction', [tx['hex']])
+            rv['index'] = find_vout_for_address_from_txobj(tx_obj, dest_address)
+
+        if return_txid:
+            rv['txid'] = txid.hex()
+
+        return rv
+
+    def getBlockWithTxns(self, block_hash):
+        # TODO: Bypass decoderawtransaction and getblockheader
+        block = self.rpc('getblock', [block_hash, False])
+        block_header = self.rpc('getblockheader', [block_hash])
+        decoded_block = CBlock()
+        decoded_block = FromHex(decoded_block, block)
+
+        tx_rv = []
+        for tx in decoded_block.vtx:
+            tx_hex = tx.serialize_with_witness().hex()
+            tx_dec = self.rpc('decoderawtransaction', [tx_hex])
+            if 'hex' not in tx_dec:
+                tx_dec['hex'] = tx_hex
+
+            tx_rv.append(tx_dec)
+
+        block_rv = {
+            'hash': block_hash,
+            'tx': tx_rv,
+            'confirmations': block_header['confirmations'],
+            'height': block_header['height'],
+            'version': block_header['version'],
+            'merkleroot': block_header['merkleroot'],
+        }
+
+        return block_rv
+
+    def getScriptScriptSig(self, script: bytes) -> bytearray:
+        return self.getP2SHP2WSHScriptSig(script)
+
+    def getScriptDest(self, script):
+        return self.getP2SHP2WSHDest(script)
+
+    def getDestForScriptHash(self, script_hash):
+        assert len(script_hash) == 20
+        return CScript([OP_HASH160, script_hash, OP_EQUAL])
+
+    def pubkey_to_segwit_address(self, pk: bytes) -> str:
+        pkh = hash160(pk)
+        script_out = self.getScriptForPubkeyHash(pkh)
+        return self.encodeSegwitAddressScript(script_out)
+
+    def createBLockTx(self, Kbs: bytes, output_amount: int, vkbv=None) -> bytes:
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        script_pk = self.getPkDest(Kbs)
+        tx.vout.append(self.txoType()(output_amount, script_pk))
+        return tx.serialize()
+
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int) -> bytes:
+        self._log.info('spendBLockTx %s:\n', chain_b_lock_txid.hex())
+        wtx = self.rpc('gettransaction', [chain_b_lock_txid.hex(), ])
+        lock_tx = self.loadTx(bytes.fromhex(wtx['hex']))
+
+        Kbs = self.getPubkey(kbs)
+        script_pk = self.getPkDest(Kbs)
+        locked_n = findOutput(lock_tx, script_pk)
+        ensure(locked_n is not None, 'Output not found in tx')
+        pkh_to = self.decodeAddress(address_to)
+
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+
+        chain_b_lock_txid_int = uint256_from_str(chain_b_lock_txid[::-1])
+
+        script_sig = self.getInputScriptForPubkeyHash(self.getPubkeyHash(Kbs))
+
+        tx.vin.append(CTxIn(COutPoint(chain_b_lock_txid_int, locked_n),
+                            nSequence=0,
+                            scriptSig=script_sig))
+        tx.vout.append(self.txoType()(cb_swap_value, self.getScriptForPubkeyHash(pkh_to)))
+
+        pay_fee = self.getBLockSpendTxFee(tx, b_fee)
+        tx.vout[0].nValue = cb_swap_value - pay_fee
+
+        b_lock_spend_tx = tx.serialize()
+        b_lock_spend_tx = self.signTxWithKey(b_lock_spend_tx, kbs, cb_swap_value)
+
+        return bytes.fromhex(self.publishTx(b_lock_spend_tx))
+
+    def signTxWithKey(self, tx: bytes, key: bytes, prev_amount: int) -> bytes:
+        Key = self.getPubkey(key)
+        pkh = self.getPubkeyHash(Key)
+        script = self.getScriptForP2PKH(pkh)
+
+        sig = self.signTx(key, tx, 0, script, prev_amount)
+
+        stack = [
+            sig,
+            Key,
+        ]
+        return self.setTxSignature(tx, stack)
+
+    def findTxnByHash(self, txid_hex: str):
+        # Only works for wallet txns
+        try:
+            rv = self.rpc('gettransaction', [txid_hex])
+        except Exception as ex:
+            self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
+            return None
+        if 'confirmations' in rv and rv['confirmations'] >= self.blocks_confirmed:
+            block_height = self.getBlockHeader(rv['blockhash'])['height']
+            return {'txid': txid_hex, 'amount': 0, 'height': block_height}
+        return None
+
+    def createSCLockTx(self, value: int, script: bytearray, vkbv: bytes = None) -> bytes:
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.vout.append(self.txoType()(value, self.getScriptDest(script)))
+
+        return tx.serialize()
+
+    def fundTx(self, tx_hex: str, feerate: int, lock_unspents: bool = True):
+        feerate_str = self.format_amount(feerate)
+        # TODO: unlock unspents if bid cancelled
+        options = {
+            'lockUnspents': lock_unspents,
+            'feeRate': feerate_str,
+        }
+        rv = self.rpc('fundrawtransaction', [tx_hex, options])
+
+        # Sign transaction then strip witness data to fill scriptsig
+        rv = self.rpc('signrawtransaction', [rv['hex']])
+
+        tx_signed = self.loadTx(bytes.fromhex(rv['hex']))
+        if len(tx_signed.vin) != len(tx_signed.wit.vtxinwit):
+            raise ValueError('txn has non segwit input')
+        for witness_data in tx_signed.wit.vtxinwit:
+            if len(witness_data.scriptWitness.stack) < 2:
+                raise ValueError('txn has non segwit input')
+
+        return tx_signed.serialize_without_witness()
+
+    def fundSCLockTx(self, tx_bytes: bytes, feerate, vkbv=None) -> bytes:
+        tx_funded = self.fundTx(tx_bytes.hex(), feerate)
+        return tx_funded
+
+    def createSCLockRefundTx(self, tx_lock_bytes, script_lock, Kal, Kaf, lock1_value, csv_val, tx_fee_rate, vkbv=None):
+        tx_lock = CTransaction()
+        tx_lock = self.loadTx(tx_lock_bytes)
+
+        output_script = self.getScriptDest(script_lock)
+        locked_n = findOutput(tx_lock, output_script)
+        ensure(locked_n is not None, 'Output not found in tx')
+        locked_coin = tx_lock.vout[locked_n].nValue
+
+        tx_lock.rehash()
+        tx_lock_id_int = tx_lock.sha256
+
+        refund_script = self.genScriptLockRefundTxScript(Kal, Kaf, csv_val)
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.vin.append(CTxIn(COutPoint(tx_lock_id_int, locked_n),
+                            nSequence=lock1_value,
+                            scriptSig=self.getScriptScriptSig(script_lock)))
+        tx.vout.append(self.txoType()(locked_coin, self.getScriptDest(refund_script)))
+
+        dummy_witness_stack = self.getScriptLockTxDummyWitness(script_lock)
+        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
+        vsize = self.getTxVSize(tx, add_witness_bytes=witness_bytes)
+        pay_fee = round(tx_fee_rate * vsize / 1000)
+        tx.vout[0].nValue = locked_coin - pay_fee
+
+        tx.rehash()
+        self._log.info('createSCLockRefundTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
+                       i2h(tx.sha256), tx_fee_rate, vsize, pay_fee)
+
+        return tx.serialize(), refund_script, tx.vout[0].nValue
+
+    def createSCLockRefundSpendTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_refund_to, tx_fee_rate, vkbv=None):
+        # Returns the coinA locked coin to the leader
+        # The follower will sign the multisig path with a signature encumbered by the leader's coinB spend pubkey
+        # If the leader publishes the decrypted signature the leader's coinB spend privatekey will be revealed to the follower
+
+        tx_lock_refund = self.loadTx(tx_lock_refund_bytes)
+
+        output_script = self.getScriptDest(script_lock_refund)
+        locked_n = findOutput(tx_lock_refund, output_script)
+        ensure(locked_n is not None, 'Output not found in tx')
+        locked_coin = tx_lock_refund.vout[locked_n].nValue
+
+        tx_lock_refund.rehash()
+        tx_lock_refund_hash_int = tx_lock_refund.sha256
+
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.vin.append(CTxIn(COutPoint(tx_lock_refund_hash_int, locked_n),
+                            nSequence=0,
+                            scriptSig=self.getScriptScriptSig(script_lock_refund)))
+
+        tx.vout.append(self.txoType()(locked_coin, self.getScriptForPubkeyHash(pkh_refund_to)))
+
+        dummy_witness_stack = self.getScriptLockRefundSpendTxDummyWitness(script_lock_refund)
+        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
+        vsize = self.getTxVSize(tx, add_witness_bytes=witness_bytes)
+        pay_fee = round(tx_fee_rate * vsize / 1000)
+        tx.vout[0].nValue = locked_coin - pay_fee
+
+        tx.rehash()
+        self._log.info('createSCLockRefundSpendTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
+                       i2h(tx.sha256), tx_fee_rate, vsize, pay_fee)
+
+        return tx.serialize()
+
+    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv=None):
+        # lock refund swipe tx
+        # Sends the coinA locked coin to the follower
+
+        tx_lock_refund = self.loadTx(tx_lock_refund_bytes)
+
+        output_script = self.getScriptDest(script_lock_refund)
+        locked_n = findOutput(tx_lock_refund, output_script)
+        ensure(locked_n is not None, 'Output not found in tx')
+        locked_coin = tx_lock_refund.vout[locked_n].nValue
+
+        A, B, lock2_value, C = self.extractScriptLockRefundScriptValues(script_lock_refund)
+
+        tx_lock_refund.rehash()
+        tx_lock_refund_hash_int = tx_lock_refund.sha256
+
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.vin.append(CTxIn(COutPoint(tx_lock_refund_hash_int, locked_n),
+                            nSequence=lock2_value,
+                            scriptSig=self.getScriptScriptSig(script_lock_refund)))
+
+        tx.vout.append(self.txoType()(locked_coin, self.getScriptForPubkeyHash(pkh_dest)))
+
+        dummy_witness_stack = self.getScriptLockRefundSwipeTxDummyWitness(script_lock_refund)
+        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
+        vsize = self.getTxVSize(tx, add_witness_bytes=witness_bytes)
+        pay_fee = round(tx_fee_rate * vsize / 1000)
+        tx.vout[0].nValue = locked_coin - pay_fee
+
+        tx.rehash()
+        self._log.info('createSCLockRefundSpendToFTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
+                       i2h(tx.sha256), tx_fee_rate, vsize, pay_fee)
+
+        return tx.serialize()
+
+    def createSCLockSpendTx(self, tx_lock_bytes, script_lock, pkh_dest, tx_fee_rate, vkbv=None, fee_info={}):
+        tx_lock = self.loadTx(tx_lock_bytes)
+        output_script = self.getScriptDest(script_lock)
+        locked_n = findOutput(tx_lock, output_script)
+        ensure(locked_n is not None, 'Output not found in tx')
+        locked_coin = tx_lock.vout[locked_n].nValue
+
+        tx_lock.rehash()
+        tx_lock_id_int = tx_lock.sha256
+
+        tx = CTransaction()
+        tx.nVersion = self.txVersion()
+        tx.vin.append(CTxIn(COutPoint(tx_lock_id_int, locked_n),
+                            scriptSig=self.getScriptScriptSig(script_lock)))
+
+        tx.vout.append(self.txoType()(locked_coin, self.getScriptForPubkeyHash(pkh_dest)))
+
+        dummy_witness_stack = self.getScriptLockTxDummyWitness(script_lock)
+        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
+        vsize = self.getTxVSize(tx, add_witness_bytes=witness_bytes)
+        pay_fee = round(tx_fee_rate * vsize / 1000)
+        tx.vout[0].nValue = locked_coin - pay_fee
+
+        fee_info['fee_paid'] = pay_fee
+        fee_info['rate_used'] = tx_fee_rate
+        fee_info['witness_bytes'] = witness_bytes
+        fee_info['vsize'] = vsize
+
+        tx.rehash()
+        self._log.info('createSCLockSpendTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
+                       i2h(tx.sha256), tx_fee_rate, vsize, pay_fee)
+
+        return tx.serialize()

basicswap/interface/nmc.py

@@ -19,7 +19,7 @@ class NMCInterface(BTCInterface):
 
     def getLockTxHeight(self, txid, dest_address, bid_amount, rescan_from, find_index=False):
         self._log.debug('[rm] scantxoutset start')  # scantxoutset is slow
-        ro = self.rpc_callback('scantxoutset', ['start', ['addr({})'.format(dest_address)]])  # TODO: Use combo(address) where possible
+        ro = self.rpc('scantxoutset', ['start', ['addr({})'.format(dest_address)]])  # TODO: Use combo(address) where possible
         self._log.debug('[rm] scantxoutset end')
         return_txid = True if txid is None else False
         for o in ro['unspents']:

basicswap/interface/part.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2022 tecnovert
+# Copyright (c) 2020-2024 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -17,7 +17,6 @@ from basicswap.contrib.test_framework.script import (
     OP_DUP, OP_HASH160, OP_EQUALVERIFY, OP_CHECKSIG
 )
 from basicswap.util import (
-    i2b,
     ensure,
     make_int,
     TemporaryError,
@@ -43,6 +42,8 @@ class BalanceTypes(IntEnum):
 class PARTInterface(BTCInterface):
     @staticmethod
     def coin_type():
+        # Returns the base coin type
+        # ANON and BLIND PART will return Coins.PART
         return Coins.PART
 
     @staticmethod
@@ -58,8 +59,12 @@ class PARTInterface(BTCInterface):
         return 0xa0
 
     @staticmethod
-    def xmr_swap_alock_spend_tx_vsize() -> int:
+    def xmr_swap_a_lock_spend_tx_vsize() -> int:
-        return 213
+        return 200
+
+    @staticmethod
+    def xmr_swap_b_lock_spend_tx_vsize() -> int:
+        return 138
 
     @staticmethod
     def txoType():
@@ -77,15 +82,15 @@ class PARTInterface(BTCInterface):
         # TODO: Double check
         return True
 
-    def getNewAddress(self, use_segwit, label='swap_receive'):
+    def getNewAddress(self, use_segwit, label='swap_receive') -> str:
-        return self.rpc_callback('getnewaddress', [label])
+        return self.rpc_wallet('getnewaddress', [label])
 
-    def getNewStealthAddress(self, label='swap_stealth'):
+    def getNewStealthAddress(self, label='swap_stealth') -> str:
-        return self.rpc_callback('getnewstealthaddress', [label])
+        return self.rpc_wallet('getnewstealthaddress', [label])
 
     def haveSpentIndex(self):
         version = self.getDaemonVersion()
-        index_info = self.rpc_callback('getinsightinfo' if int(str(version)[:2]) > 19 else 'getindexinfo')
+        index_info = self.rpc('getinsightinfo' if int(str(version)[:2]) > 19 else 'getindexinfo')
         return index_info['spentindex']
 
     def initialiseWallet(self, key):
@@ -93,33 +98,33 @@ class PARTInterface(BTCInterface):
 
     def withdrawCoin(self, value, addr_to, subfee):
         params = [addr_to, value, '', '', subfee, '', True, self._conf_target]
-        return self.rpc_callback('sendtoaddress', params)
+        return self.rpc_wallet('sendtoaddress', params)
 
     def sendTypeTo(self, type_from, type_to, value, addr_to, subfee):
         params = [type_from, type_to,
                   [{'address': addr_to, 'amount': value, 'subfee': subfee}, ],
                   '', '', self._anon_tx_ring_size, 1, False,
                   {'conf_target': self._conf_target}]
-        return self.rpc_callback('sendtypeto', params)
+        return self.rpc_wallet('sendtypeto', params)
 
-    def getScriptForPubkeyHash(self, pkh):
+    def getScriptForPubkeyHash(self, pkh: bytes) -> CScript:
         return CScript([OP_DUP, OP_HASH160, pkh, OP_EQUALVERIFY, OP_CHECKSIG])
 
-    def formatStealthAddress(self, scan_pubkey, spend_pubkey):
+    def formatStealthAddress(self, scan_pubkey, spend_pubkey) -> str:
         prefix_byte = chainparams[self.coin_type()][self._network]['stealth_key_prefix']
 
         return encodeStealthAddress(prefix_byte, scan_pubkey, spend_pubkey)
 
-    def getWitnessStackSerialisedLength(self, witness_stack):
+    def getWitnessStackSerialisedLength(self, witness_stack) -> int:
-        length = getCompactSizeLen(len(witness_stack))
+        length: int = getCompactSizeLen(len(witness_stack))
         for e in witness_stack:
-            length += getWitnessElementLen(len(e) // 2)  # hex -> bytes
+            length += getWitnessElementLen(len(e))
         return length
 
-    def getWalletRestoreHeight(self):
+    def getWalletRestoreHeight(self) -> int:
-        start_time = self.rpc_callback('getwalletinfo')['keypoololdest']
+        start_time = self.rpc_wallet('getwalletinfo')['keypoololdest']
 
-        blockchaininfo = self.rpc_callback('getblockchaininfo')
+        blockchaininfo = self.getBlockchainInfo()
         best_block = blockchaininfo['bestblockhash']
 
         chain_synced = round(blockchaininfo['verificationprogress'], 3)
@@ -127,17 +132,41 @@ class PARTInterface(BTCInterface):
             raise ValueError('{} chain isn\'t synced.'.format(self.coin_name()))
 
         self._log.debug('Finding block at time: {}'.format(start_time))
-        block_hash = self.rpc_callback('getblockhashafter', [start_time])
+        block_hash = self.rpc('getblockhashafter', [start_time])
-        block_header = self.rpc_callback('getblockheader', [block_hash])
+        block_header = self.rpc('getblockheader', [block_hash])
         return block_header['height']
 
+    def getHTLCSpendTxVSize(self, redeem: bool = True) -> int:
+        tx_vsize = 5  # Add a few bytes, sequence in script takes variable amount of bytes
+        tx_vsize += 204 if redeem else 187
+        return tx_vsize
+
+    def getUnspentsByAddr(self):
+        unspent_addr = dict()
+        unspent = self.rpc_wallet('listunspent')
+        for u in unspent:
+            if u['spendable'] is not True:
+                continue
+            if 'address' not in u:
+                continue
+            unspent_addr[u['address']] = unspent_addr.get(u['address'], 0) + self.make_int(u['amount'], r=1)
+        return unspent_addr
+
 
 class PARTInterfaceBlind(PARTInterface):
     @staticmethod
     def balance_type():
         return BalanceTypes.BLIND
 
-    def coin_name(self):
+    @staticmethod
+    def xmr_swap_a_lock_spend_tx_vsize() -> int:
+        return 1032
+
+    @staticmethod
+    def xmr_swap_b_lock_spend_tx_vsize() -> int:
+        return 980
+
+    def coin_name(self) -> str:
         return super().coin_name() + ' Blind'
 
     def getScriptLockTxNonce(self, data):
@@ -153,24 +182,23 @@ class PARTInterfaceBlind(PARTInterface):
             if txo['type'] != 'blind':
                 continue
             try:
-                blinded_info = self.rpc_callback('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], nonce.hex()])
+                blinded_info = self.rpc('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], nonce.hex()])
                 output_n = txo['n']
 
-                self.rpc_callback('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], nonce.hex()])
+                self.rpc('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], nonce.hex()])
                 break
             except Exception as e:
                 self._log.debug('Searching for locked output: {}'.format(str(e)))
                 continue
             # Should not be possible for commitment not to match
-            v = self.rpc_callback('verifycommitment', [txo['valueCommitment'], blinded_info['blind'], blinded_info['amount']])
+            v = self.rpc('verifycommitment', [txo['valueCommitment'], blinded_info['blind'], blinded_info['amount']])
             ensure(v['result'] is True, 'verifycommitment failed')
         return output_n, blinded_info
 
-    def createScriptLockTx(self, value, Kal, Kaf, vkbv):
+    def createSCLockTx(self, value: int, script: bytearray, vkbv: bytes) -> bytes:
-        script = self.genScriptLockTxScript(Kal, Kaf)
 
         # Nonce is derived from vkbv, ephemeral_key isn't used
-        ephemeral_key = i2b(self.getNewSecretKey())
+        ephemeral_key = self.getNewSecretKey()
         ephemeral_pubkey = self.getPubkey(ephemeral_key)
         assert (len(ephemeral_pubkey) == 33)
         nonce = self.getScriptLockTxNonce(vkbv)
@@ -178,23 +206,23 @@ class PARTInterfaceBlind(PARTInterface):
         inputs = []
         outputs = [{'type': 'blind', 'amount': self.format_amount(value), 'address': p2wsh_addr, 'nonce': nonce.hex(), 'data': ephemeral_pubkey.hex()}]
         params = [inputs, outputs]
-        rv = self.rpc_callback('createrawparttransaction', params)
+        rv = self.rpc_wallet('createrawparttransaction', params)
 
         tx_bytes = bytes.fromhex(rv['hex'])
-        return tx_bytes, script
+        return tx_bytes
 
-    def fundScriptLockTx(self, tx_bytes, feerate, vkbv):
+    def fundSCLockTx(self, tx_bytes: bytes, feerate: int, vkbv: bytes) -> bytes:
         feerate_str = self.format_amount(feerate)
         # TODO: unlock unspents if bid cancelled
 
         tx_hex = tx_bytes.hex()
         nonce = self.getScriptLockTxNonce(vkbv)
 
-        tx_obj = self.rpc_callback('decoderawtransaction', [tx_hex])
+        tx_obj = self.rpc('decoderawtransaction', [tx_hex])
 
         assert (len(tx_obj['vout']) == 1)
         txo = tx_obj['vout'][0]
-        blinded_info = self.rpc_callback('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], nonce.hex()])
+        blinded_info = self.rpc('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], nonce.hex()])
 
         outputs_info = {0: {'value': blinded_info['amount'], 'blind': blinded_info['blind'], 'nonce': nonce.hex()}}
 
@@ -202,14 +230,14 @@ class PARTInterfaceBlind(PARTInterface):
             'lockUnspents': True,
             'feeRate': feerate_str,
         }
-        rv = self.rpc_callback('fundrawtransactionfrom', ['blind', tx_hex, {}, outputs_info, options])
+        rv = self.rpc('fundrawtransactionfrom', ['blind', tx_hex, {}, outputs_info, options])
         return bytes.fromhex(rv['hex'])
 
-    def createScriptLockRefundTx(self, tx_lock_bytes, script_lock, Kal, Kaf, lock1_value, csv_val, tx_fee_rate, vkbv):
+    def createSCLockRefundTx(self, tx_lock_bytes, script_lock, Kal, Kaf, lock1_value, csv_val, tx_fee_rate, vkbv):
-        lock_tx_obj = self.rpc_callback('decoderawtransaction', [tx_lock_bytes.hex()])
+        lock_tx_obj = self.rpc('decoderawtransaction', [tx_lock_bytes.hex()])
         assert (self.getTxid(tx_lock_bytes).hex() == lock_tx_obj['txid'])
         # Nonce is derived from vkbv, ephemeral_key isn't used
-        ephemeral_key = i2b(self.getNewSecretKey())
+        ephemeral_key = self.getNewSecretKey()
         ephemeral_pubkey = self.getPubkey(ephemeral_key)
         assert (len(ephemeral_pubkey) == 33)
         nonce = self.getScriptLockTxNonce(vkbv)
@@ -227,14 +255,15 @@ class PARTInterfaceBlind(PARTInterface):
         inputs = [{'txid': tx_lock_id, 'vout': spend_n, 'sequence': lock1_value, 'blindingfactor': input_blinded_info['blind']}]
         outputs = [{'type': 'blind', 'amount': locked_coin, 'address': p2wsh_addr, 'nonce': output_nonce.hex(), 'data': ephemeral_pubkey.hex()}]
         params = [inputs, outputs]
-        rv = self.rpc_callback('createrawparttransaction', params)
+        rv = self.rpc_wallet('createrawparttransaction', params)
         lock_refund_tx_hex = rv['hex']
 
         # Set dummy witness data for fee estimation
         dummy_witness_stack = self.getScriptLockTxDummyWitness(script_lock)
+        dummy_witness_stack = [x.hex() for x in dummy_witness_stack]
 
         # Use a junk change pubkey to avoid adding unused keys to the wallet
-        zero_change_key = i2b(self.getNewSecretKey())
+        zero_change_key = self.getNewSecretKey()
         zero_change_pubkey = self.getPubkey(zero_change_key)
         inputs_info = {'0': {'value': input_blinded_info['amount'], 'blind': input_blinded_info['blind'], 'witnessstack': dummy_witness_stack}}
         outputs_info = rv['amounts']
@@ -243,7 +272,7 @@ class PARTInterfaceBlind(PARTInterface):
             'feeRate': self.format_amount(tx_fee_rate),
             'subtractFeeFromOutputs': [0, ]
         }
-        rv = self.rpc_callback('fundrawtransactionfrom', ['blind', lock_refund_tx_hex, inputs_info, outputs_info, options])
+        rv = self.rpc_wallet('fundrawtransactionfrom', ['blind', lock_refund_tx_hex, inputs_info, outputs_info, options])
         lock_refund_tx_hex = rv['hex']
 
         for vout, txo in rv['output_amounts'].items():
@@ -252,12 +281,12 @@ class PARTInterfaceBlind(PARTInterface):
 
         return bytes.fromhex(lock_refund_tx_hex), refund_script, refunded_value
 
-    def createScriptLockRefundSpendTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_refund_to, tx_fee_rate, vkbv):
+    def createSCLockRefundSpendTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_refund_to, tx_fee_rate, vkbv):
         # Returns the coinA locked coin to the leader
         # The follower will sign the multisig path with a signature encumbered by the leader's coinB spend pubkey
         # If the leader publishes the decrypted signature the leader's coinB spend privatekey will be revealed to the follower
 
-        lock_refund_tx_obj = self.rpc_callback('decoderawtransaction', [tx_lock_refund_bytes.hex()])
+        lock_refund_tx_obj = self.rpc('decoderawtransaction', [tx_lock_refund_bytes.hex()])
         # Nonce is derived from vkbv
         nonce = self.getScriptLockRefundTxNonce(vkbv)
 
@@ -267,7 +296,7 @@ class PARTInterfaceBlind(PARTInterface):
 
         tx_lock_refund_id = lock_refund_tx_obj['txid']
         addr_out = self.pkh_to_address(pkh_refund_to)
-        addr_info = self.rpc_callback('getaddressinfo', [addr_out])
+        addr_info = self.rpc_wallet('getaddressinfo', [addr_out])
         output_pubkey_hex = addr_info['pubkey']
 
         # Follower won't be able to decode output to check amount, shouldn't matter as fee is public and output is to leader, sum has to balance
@@ -275,14 +304,15 @@ class PARTInterfaceBlind(PARTInterface):
         inputs = [{'txid': tx_lock_refund_id, 'vout': spend_n, 'sequence': 0, 'blindingfactor': input_blinded_info['blind']}]
         outputs = [{'type': 'blind', 'amount': input_blinded_info['amount'], 'address': addr_out, 'pubkey': output_pubkey_hex}]
         params = [inputs, outputs]
-        rv = self.rpc_callback('createrawparttransaction', params)
+        rv = self.rpc_wallet('createrawparttransaction', params)
         lock_refund_spend_tx_hex = rv['hex']
 
         # Set dummy witness data for fee estimation
         dummy_witness_stack = self.getScriptLockRefundSpendTxDummyWitness(script_lock_refund)
+        dummy_witness_stack = [x.hex() for x in dummy_witness_stack]
 
         # Use a junk change pubkey to avoid adding unused keys to the wallet
-        zero_change_key = i2b(self.getNewSecretKey())
+        zero_change_key = self.getNewSecretKey()
         zero_change_pubkey = self.getPubkey(zero_change_key)
         inputs_info = {'0': {'value': input_blinded_info['amount'], 'blind': input_blinded_info['blind'], 'witnessstack': dummy_witness_stack}}
         outputs_info = rv['amounts']
@@ -292,17 +322,17 @@ class PARTInterfaceBlind(PARTInterface):
             'subtractFeeFromOutputs': [0, ]
         }
 
-        rv = self.rpc_callback('fundrawtransactionfrom', ['blind', lock_refund_spend_tx_hex, inputs_info, outputs_info, options])
+        rv = self.rpc_wallet('fundrawtransactionfrom', ['blind', lock_refund_spend_tx_hex, inputs_info, outputs_info, options])
         lock_refund_spend_tx_hex = rv['hex']
 
         return bytes.fromhex(lock_refund_spend_tx_hex)
 
-    def verifyLockTx(self, tx_bytes, script_out,
+    def verifySCLockTx(self, tx_bytes, script_out,
-                     swap_value,
+                       swap_value,
-                     Kal, Kaf,
+                       Kal, Kaf,
-                     feerate,
+                       feerate,
-                     check_lock_tx_inputs, vkbv):
+                       check_lock_tx_inputs, vkbv):
-        lock_tx_obj = self.rpc_callback('decoderawtransaction', [tx_bytes.hex()])
+        lock_tx_obj = self.rpc('decoderawtransaction', [tx_bytes.hex()])
         lock_txid_hex = lock_tx_obj['txid']
         self._log.info('Verifying lock tx: {}.'.format(lock_txid_hex))
 
@@ -341,10 +371,10 @@ class PARTInterfaceBlind(PARTInterface):
 
         return bytes.fromhex(lock_txid_hex), lock_output_n
 
-    def verifyLockRefundTx(self, tx_bytes, lock_tx_bytes, script_out,
+    def verifySCLockRefundTx(self, tx_bytes, lock_tx_bytes, script_out,
-                           prevout_id, prevout_n, prevout_seq, prevout_script,
+                             prevout_id, prevout_n, prevout_seq, prevout_script,
-                           Kal, Kaf, csv_val_expect, swap_value, feerate, vkbv):
+                             Kal, Kaf, csv_val_expect, swap_value, feerate, vkbv):
-        lock_refund_tx_obj = self.rpc_callback('decoderawtransaction', [tx_bytes.hex()])
+        lock_refund_tx_obj = self.rpc('decoderawtransaction', [tx_bytes.hex()])
         lock_refund_txid_hex = lock_refund_tx_obj['txid']
         self._log.info('Verifying lock refund tx: {}.'.format(lock_refund_txid_hex))
 
@@ -377,10 +407,10 @@ class PARTInterfaceBlind(PARTInterface):
         ensure(C == Kaf, 'Bad script pubkey')
 
         # Check rangeproofs and commitments sum
-        lock_tx_obj = self.rpc_callback('decoderawtransaction', [lock_tx_bytes.hex()])
+        lock_tx_obj = self.rpc('decoderawtransaction', [lock_tx_bytes.hex()])
         prevout = lock_tx_obj['vout'][prevout_n]
         prevtxns = [{'txid': prevout_id.hex(), 'vout': prevout_n, 'scriptPubKey': prevout['scriptPubKey']['hex'], 'amount_commitment': prevout['valueCommitment']}]
-        rv = self.rpc_callback('verifyrawtransaction', [tx_bytes.hex(), prevtxns])
+        rv = self.rpc('verifyrawtransaction', [tx_bytes.hex(), prevtxns])
         ensure(rv['outputs_valid'] is True, 'Invalid outputs')
         ensure(rv['inputs_valid'] is True, 'Invalid inputs')
 
@@ -399,11 +429,11 @@ class PARTInterfaceBlind(PARTInterface):
 
         return bytes.fromhex(lock_refund_txid_hex), lock_refund_txo_value, lock_refund_output_n
 
-    def verifyLockRefundSpendTx(self, tx_bytes, lock_refund_tx_bytes,
+    def verifySCLockRefundSpendTx(self, tx_bytes, lock_refund_tx_bytes,
-                                lock_refund_tx_id, prevout_script,
+                                  lock_refund_tx_id, prevout_script,
-                                Kal,
+                                  Kal,
-                                prevout_n, prevout_value, feerate, vkbv):
+                                  prevout_n, prevout_value, feerate, vkbv):
-        lock_refund_spend_tx_obj = self.rpc_callback('decoderawtransaction', [tx_bytes.hex()])
+        lock_refund_spend_tx_obj = self.rpc('decoderawtransaction', [tx_bytes.hex()])
         lock_refund_spend_txid_hex = lock_refund_spend_tx_obj['txid']
         self._log.info('Verifying lock refund spend tx: {}.'.format(lock_refund_spend_txid_hex))
 
@@ -422,10 +452,10 @@ class PARTInterfaceBlind(PARTInterface):
         # Follower is not concerned with them as they pay to leader
 
         # Check rangeproofs and commitments sum
-        lock_refund_tx_obj = self.rpc_callback('decoderawtransaction', [lock_refund_tx_bytes.hex()])
+        lock_refund_tx_obj = self.rpc('decoderawtransaction', [lock_refund_tx_bytes.hex()])
         prevout = lock_refund_tx_obj['vout'][prevout_n]
         prevtxns = [{'txid': lock_refund_tx_id.hex(), 'vout': prevout_n, 'scriptPubKey': prevout['scriptPubKey']['hex'], 'amount_commitment': prevout['valueCommitment']}]
-        rv = self.rpc_callback('verifyrawtransaction', [tx_bytes.hex(), prevtxns])
+        rv = self.rpc('verifyrawtransaction', [tx_bytes.hex(), prevtxns])
         ensure(rv['outputs_valid'] is True, 'Invalid outputs')
         ensure(rv['inputs_valid'] is True, 'Invalid inputs')
 
@@ -440,28 +470,28 @@ class PARTInterfaceBlind(PARTInterface):
         return True
 
     def getLockTxSwapOutputValue(self, bid, xmr_swap):
-        lock_tx_obj = self.rpc_callback('decoderawtransaction', [xmr_swap.a_lock_tx.hex()])
+        lock_tx_obj = self.rpc('decoderawtransaction', [xmr_swap.a_lock_tx.hex()])
         nonce = self.getScriptLockTxNonce(xmr_swap.vkbv)
         output_n, _ = self.findOutputByNonce(lock_tx_obj, nonce)
         ensure(output_n is not None, 'Output not found in tx')
         return bytes.fromhex(lock_tx_obj['vout'][output_n]['valueCommitment'])
 
     def getLockRefundTxSwapOutputValue(self, bid, xmr_swap):
-        lock_refund_tx_obj = self.rpc_callback('decoderawtransaction', [xmr_swap.a_lock_refund_tx.hex()])
+        lock_refund_tx_obj = self.rpc('decoderawtransaction', [xmr_swap.a_lock_refund_tx.hex()])
         nonce = self.getScriptLockRefundTxNonce(xmr_swap.vkbv)
         output_n, _ = self.findOutputByNonce(lock_refund_tx_obj, nonce)
         ensure(output_n is not None, 'Output not found in tx')
         return bytes.fromhex(lock_refund_tx_obj['vout'][output_n]['valueCommitment'])
 
     def getLockRefundTxSwapOutput(self, xmr_swap):
-        lock_refund_tx_obj = self.rpc_callback('decoderawtransaction', [xmr_swap.a_lock_refund_tx.hex()])
+        lock_refund_tx_obj = self.rpc('decoderawtransaction', [xmr_swap.a_lock_refund_tx.hex()])
         nonce = self.getScriptLockRefundTxNonce(xmr_swap.vkbv)
         output_n, _ = self.findOutputByNonce(lock_refund_tx_obj, nonce)
         ensure(output_n is not None, 'Output not found in tx')
         return output_n
 
-    def createScriptLockSpendTx(self, tx_lock_bytes, script_lock, pk_dest, tx_fee_rate, vkbv):
+    def createSCLockSpendTx(self, tx_lock_bytes: bytes, script_lock: bytes, pk_dest: bytes, tx_fee_rate: int, vkbv: bytes, fee_info={}) -> bytes:
-        lock_tx_obj = self.rpc_callback('decoderawtransaction', [tx_lock_bytes.hex()])
+        lock_tx_obj = self.rpc('decoderawtransaction', [tx_lock_bytes.hex()])
         lock_txid_hex = lock_tx_obj['txid']
 
         ensure(lock_tx_obj['version'] == self.txVersion(), 'Bad version')
@@ -477,16 +507,16 @@ class PARTInterfaceBlind(PARTInterface):
         inputs = [{'txid': lock_txid_hex, 'vout': spend_n, 'sequence': 0, 'blindingfactor': blinded_info['blind']}]
         outputs = [{'type': 'blind', 'amount': blinded_info['amount'], 'address': addr_out, 'pubkey': pk_dest.hex()}]
         params = [inputs, outputs]
-        rv = self.rpc_callback('createrawparttransaction', params)
+        rv = self.rpc_wallet('createrawparttransaction', params)
         lock_spend_tx_hex = rv['hex']
 
         # Set dummy witness data for fee estimation
         dummy_witness_stack = self.getScriptLockTxDummyWitness(script_lock)
 
         # Use a junk change pubkey to avoid adding unused keys to the wallet
-        zero_change_key = i2b(self.getNewSecretKey())
+        zero_change_key = self.getNewSecretKey()
         zero_change_pubkey = self.getPubkey(zero_change_key)
-        inputs_info = {'0': {'value': blinded_info['amount'], 'blind': blinded_info['blind'], 'witnessstack': dummy_witness_stack}}
+        inputs_info = {'0': {'value': blinded_info['amount'], 'blind': blinded_info['blind'], 'witnessstack': [x.hex() for x in dummy_witness_stack]}}
         outputs_info = rv['amounts']
         options = {
             'changepubkey': zero_change_pubkey.hex(),
@@ -494,22 +524,29 @@ class PARTInterfaceBlind(PARTInterface):
             'subtractFeeFromOutputs': [0, ]
         }
 
-        rv = self.rpc_callback('fundrawtransactionfrom', ['blind', lock_spend_tx_hex, inputs_info, outputs_info, options])
+        rv = self.rpc_wallet('fundrawtransactionfrom', ['blind', lock_spend_tx_hex, inputs_info, outputs_info, options])
         lock_spend_tx_hex = rv['hex']
-        lock_spend_tx_obj = self.rpc_callback('decoderawtransaction', [lock_spend_tx_hex])
+        lock_spend_tx_obj = self.rpc('decoderawtransaction', [lock_spend_tx_hex])
-
-        vsize = lock_spend_tx_obj['vsize']
         pay_fee = make_int(lock_spend_tx_obj['vout'][0]['ct_fee'])
+
+        # lock_spend_tx_hex does not include the dummy witness stack
+        witness_bytes = self.getWitnessStackSerialisedLength(dummy_witness_stack)
+        vsize = self.getTxVSize(self.loadTx(bytes.fromhex(lock_spend_tx_hex)), add_witness_bytes=witness_bytes)
         actual_tx_fee_rate = pay_fee * 1000 // vsize
-        self._log.info('createScriptLockSpendTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
+        self._log.info('createSCLockSpendTx %s:\n    fee_rate, vsize, fee: %ld, %ld, %ld.',
                        lock_spend_tx_obj['txid'], actual_tx_fee_rate, vsize, pay_fee)
 
+        fee_info['vsize'] = vsize
+        fee_info['fee_paid'] = pay_fee
+        fee_info['rate_input'] = tx_fee_rate
+        fee_info['rate_actual'] = actual_tx_fee_rate
+
         return bytes.fromhex(lock_spend_tx_hex)
 
-    def verifyLockSpendTx(self, tx_bytes,
+    def verifySCLockSpendTx(self, tx_bytes,
-                          lock_tx_bytes, lock_tx_script,
+                            lock_tx_bytes, lock_tx_script,
-                          a_pk_f, feerate, vkbv):
+                            a_pk_f, feerate, vkbv):
-        lock_spend_tx_obj = self.rpc_callback('decoderawtransaction', [tx_bytes.hex()])
+        lock_spend_tx_obj = self.rpc('decoderawtransaction', [tx_bytes.hex()])
         lock_spend_txid_hex = lock_spend_tx_obj['txid']
         self._log.info('Verifying lock spend tx: {}.'.format(lock_spend_txid_hex))
 
@@ -517,7 +554,7 @@ class PARTInterfaceBlind(PARTInterface):
         ensure(lock_spend_tx_obj['locktime'] == 0, 'Bad nLockTime')
         ensure(len(lock_spend_tx_obj['vin']) == 1, 'tx doesn\'t have one input')
 
-        lock_tx_obj = self.rpc_callback('decoderawtransaction', [lock_tx_bytes.hex()])
+        lock_tx_obj = self.rpc('decoderawtransaction', [lock_tx_bytes.hex()])
         lock_txid_hex = lock_tx_obj['txid']
 
         # Find the output of the lock tx to verify
@@ -533,7 +570,7 @@ class PARTInterfaceBlind(PARTInterface):
         ensure(len(lock_spend_tx_obj['vout']) == 3, 'tx doesn\'t have three outputs')
 
         addr_out = self.pubkey_to_address(a_pk_f)
-        privkey = self.rpc_callback('dumpprivkey', [addr_out])
+        privkey = self.rpc_wallet('dumpprivkey', [addr_out])
 
         # Find output:
         output_blinded_info = None
@@ -542,7 +579,7 @@ class PARTInterfaceBlind(PARTInterface):
             if txo['type'] != 'blind':
                 continue
             try:
-                output_blinded_info = self.rpc_callback('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], privkey, txo['data_hex']])
+                output_blinded_info = self.rpc('rewindrangeproof', [txo['rangeproof'], txo['valueCommitment'], privkey, txo['data_hex']])
                 output_n = txo['n']
                 break
             except Exception as e:
@@ -551,13 +588,13 @@ class PARTInterfaceBlind(PARTInterface):
         ensure(output_n is not None, 'Output not found in tx')
 
         # Commitment
-        v = self.rpc_callback('verifycommitment', [lock_spend_tx_obj['vout'][output_n]['valueCommitment'], output_blinded_info['blind'], output_blinded_info['amount']])
+        v = self.rpc('verifycommitment', [lock_spend_tx_obj['vout'][output_n]['valueCommitment'], output_blinded_info['blind'], output_blinded_info['amount']])
         ensure(v['result'] is True, 'verifycommitment failed')
 
         # Check rangeproofs and commitments sum
         prevout = lock_tx_obj['vout'][spend_n]
         prevtxns = [{'txid': lock_txid_hex, 'vout': spend_n, 'scriptPubKey': prevout['scriptPubKey']['hex'], 'amount_commitment': prevout['valueCommitment']}]
-        rv = self.rpc_callback('verifyrawtransaction', [tx_bytes.hex(), prevtxns])
+        rv = self.rpc('verifyrawtransaction', [tx_bytes.hex(), prevtxns])
         ensure(rv['outputs_valid'] is True, 'Invalid outputs')
         ensure(rv['inputs_valid'] is True, 'Invalid inputs')
 
@@ -578,10 +615,10 @@ class PARTInterfaceBlind(PARTInterface):
 
         return True
 
-    def createScriptLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv):
+    def createSCLockRefundSpendToFTx(self, tx_lock_refund_bytes, script_lock_refund, pkh_dest, tx_fee_rate, vkbv):
         # lock refund swipe tx
         # Sends the coinA locked coin to the follower
-        lock_refund_tx_obj = self.rpc_callback('decoderawtransaction', [tx_lock_refund_bytes.hex()])
+        lock_refund_tx_obj = self.rpc('decoderawtransaction', [tx_lock_refund_bytes.hex()])
         nonce = self.getScriptLockRefundTxNonce(vkbv)
 
         # Find the output of the lock refund tx to spend
@@ -590,7 +627,7 @@ class PARTInterfaceBlind(PARTInterface):
 
         tx_lock_refund_id = lock_refund_tx_obj['txid']
         addr_out = self.pkh_to_address(pkh_dest)
-        addr_info = self.rpc_callback('getaddressinfo', [addr_out])
+        addr_info = self.rpc_wallet('getaddressinfo', [addr_out])
         output_pubkey_hex = addr_info['pubkey']
 
         A, B, lock2_value, C = self.extractScriptLockRefundScriptValues(script_lock_refund)
@@ -600,15 +637,16 @@ class PARTInterfaceBlind(PARTInterface):
         inputs = [{'txid': tx_lock_refund_id, 'vout': spend_n, 'sequence': lock2_value, 'blindingfactor': input_blinded_info['blind']}]
         outputs = [{'type': 'blind', 'amount': input_blinded_info['amount'], 'address': addr_out, 'pubkey': output_pubkey_hex}]
         params = [inputs, outputs]
-        rv = self.rpc_callback('createrawparttransaction', params)
+        rv = self.rpc_wallet('createrawparttransaction', params)
 
         lock_refund_swipe_tx_hex = rv['hex']
 
         # Set dummy witness data for fee estimation
         dummy_witness_stack = self.getScriptLockRefundSwipeTxDummyWitness(script_lock_refund)
+        dummy_witness_stack = [x.hex() for x in dummy_witness_stack]
 
         # Use a junk change pubkey to avoid adding unused keys to the wallet
-        zero_change_key = i2b(self.getNewSecretKey())
+        zero_change_key = self.getNewSecretKey()
         zero_change_pubkey = self.getPubkey(zero_change_key)
         inputs_info = {'0': {'value': input_blinded_info['amount'], 'blind': input_blinded_info['blind'], 'witnessstack': dummy_witness_stack}}
         outputs_info = rv['amounts']
@@ -618,13 +656,129 @@ class PARTInterfaceBlind(PARTInterface):
             'subtractFeeFromOutputs': [0, ]
         }
 
-        rv = self.rpc_callback('fundrawtransactionfrom', ['blind', lock_refund_swipe_tx_hex, inputs_info, outputs_info, options])
+        rv = self.rpc_wallet('fundrawtransactionfrom', ['blind', lock_refund_swipe_tx_hex, inputs_info, outputs_info, options])
         lock_refund_swipe_tx_hex = rv['hex']
 
         return bytes.fromhex(lock_refund_swipe_tx_hex)
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
-        return self.make_int(self.rpc_callback('getbalances')['mine']['blind_trusted'])
+        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:
+        Kbv = self.getPubkey(vkbv)
+        sx_addr = self.formatStealthAddress(Kbv, Kbs)
+        self._log.debug('sx_addr: {}'.format(sx_addr))
+
+        # TODO: Fund from other balances
+        params = ['blind', 'blind',
+                  [{'address': sx_addr, 'amount': self.format_amount(output_amount)}, ],
+                  '', '', self._anon_tx_ring_size, 1, False,
+                  {'conf_target': self._conf_target, 'blind_watchonly_visible': True}]
+
+        txid = self.rpc_wallet('sendtypeto', params)
+        return bytes.fromhex(txid)
+
+    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)
+
+        # Tx recipient must import the stealth address as watch only
+        if bid_sender:
+            cb_swap_value *= -1
+        else:
+            addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
+            if not addr_info['iswatchonly']:
+                wif_prefix = self.chainparams_network()['key_prefix']
+                wif_scan_key = toWIF(wif_prefix, kbv)
+                self.rpc_wallet('importstealthaddress', [wif_scan_key, Kbs.hex()])
+                self._log.info('Imported watch-only sx_addr: {}'.format(sx_addr))
+                self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
+                self.rpc_wallet('rescanblockchain', [restore_height])
+
+        params = [{'include_watchonly': True, 'search': sx_addr}]
+        txns = self.rpc_wallet('filtertransactions', params)
+
+        if len(txns) == 1:
+            tx = txns[0]
+            assert (tx['outputs'][0]['stealth_address'] == sx_addr)  # Should not be possible
+            ensure(tx['outputs'][0]['type'] == 'blind', 'Output is not anon')
+
+            if make_int(tx['outputs'][0]['amount']) == cb_swap_value:
+                height = 0
+                if tx['confirmations'] > 0:
+                    chain_height = self.rpc('getblockcount')
+                    height = chain_height - (tx['confirmations'] - 1)
+                return {'txid': tx['txid'], 'amount': cb_swap_value, 'height': height}
+            else:
+                self._log.warning('Incorrect amount detected for coin b lock txn: {}'.format(tx['txid']))
+                return -1
+        return None
+
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, spend_actual_balance: bool = False) -> bytes:
+        Kbv = self.getPubkey(kbv)
+        Kbs = self.getPubkey(kbs)
+        sx_addr = self.formatStealthAddress(Kbv, Kbs)
+        addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
+        if not addr_info['ismine']:
+            wif_prefix = self.chainparams_network()['key_prefix']
+            wif_scan_key = toWIF(wif_prefix, kbv)
+            wif_spend_key = toWIF(wif_prefix, kbs)
+            self.rpc_wallet('importstealthaddress', [wif_scan_key, wif_spend_key])
+            self._log.info('Imported spend key for sx_addr: {}'.format(sx_addr))
+            self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
+            self.rpc_wallet('rescanblockchain', [restore_height])
+
+        # TODO: Remove workaround
+        # utxos = self.rpc_wallet('listunspentblind', [1, 9999999, [sx_addr]])
+        utxos = []
+        all_utxos = self.rpc_wallet('listunspentblind', [1, 9999999])
+        for utxo in all_utxos:
+            if utxo.get('stealth_address', '_') == sx_addr:
+                utxos.append(utxo)
+        if len(utxos) < 1:
+            raise TemporaryError('No spendable outputs')
+        elif len(utxos) > 1:
+            raise ValueError('Too many spendable outputs')
+
+        utxo = utxos[0]
+        utxo_sats = make_int(utxo['amount'])
+
+        if spend_actual_balance and utxo_sats != cb_swap_value:
+            self._log.warning('Spending actual balance {}, not swap value {}.'.format(utxo_sats, cb_swap_value))
+            cb_swap_value = utxo_sats
+
+        inputs = [{'tx': utxo['txid'], 'n': utxo['vout']}, ]
+        params = ['blind', 'blind',
+                  [{'address': address_to, 'amount': self.format_amount(cb_swap_value), 'subfee': True}, ],
+                  '', '', self._anon_tx_ring_size, 1, False,
+                  {'conf_target': self._conf_target, 'inputs': inputs, 'show_fee': True}]
+        rv = self.rpc_wallet('sendtypeto', params)
+        return bytes.fromhex(rv['txid'])
+
+    def findTxnByHash(self, txid_hex):
+        # txindex is enabled for Particl
+
+        try:
+            rv = self.rpc('getrawtransaction', [txid_hex, True])
+        except Exception as ex:
+            self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
+            return None
+
+        if 'confirmations' in rv and rv['confirmations'] >= self.blocks_confirmed:
+            return {'txid': txid_hex, 'amount': 0, 'height': rv['height']}
+
+        return None
+
+    def createRawFundedTransaction(self, addr_to: str, amount: int, sub_fee: bool = False, lock_unspents: bool = True) -> str:
+        txn = self.rpc_wallet('createrawtransaction', [[], {addr_to: self.format_amount(amount)}])
+
+        options = {
+            'lockUnspents': lock_unspents,
+            'conf_target': self._conf_target,
+        }
+        if sub_fee:
+            options['subtractFeeFromOutputs'] = [0,]
+        return self.rpc_wallet('fundrawtransactionfrom', ['blind', txn, options])['hex']
 
 
 class PARTInterfaceAnon(PARTInterface):
@@ -632,16 +786,25 @@ class PARTInterfaceAnon(PARTInterface):
     def balance_type():
         return BalanceTypes.ANON
 
+    @staticmethod
+    def xmr_swap_a_lock_spend_tx_vsize() -> int:
+        raise ValueError('Not possible')
+
+    @staticmethod
+    def xmr_swap_b_lock_spend_tx_vsize() -> int:
+        # TODO: Estimate with ringsize
+        return 1153
+
     @staticmethod
     def depth_spendable() -> int:
         return 12
 
-    def coin_name(self):
+    def coin_name(self) -> str:
         return super().coin_name() + ' Anon'
 
-    def publishBLockTx(self, Kbv, Kbs, output_amount, feerate):
+    def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes:
+        Kbv = self.getPubkey(kbv)
         sx_addr = self.formatStealthAddress(Kbv, Kbs)
-        self._log.debug('sx_addr: {}'.format(sx_addr))
 
         # TODO: Fund from other balances
         params = ['anon', 'anon',
@@ -649,7 +812,7 @@ class PARTInterfaceAnon(PARTInterface):
                   '', '', self._anon_tx_ring_size, 1, False,
                   {'conf_target': self._conf_target, 'blind_watchonly_visible': True}]
 
-        txid = self.rpc_callback('sendtypeto', params)
+        txid = self.rpc_wallet('sendtypeto', params)
         return bytes.fromhex(txid)
 
     def findTxB(self, kbv, Kbs, cb_swap_value, cb_block_confirmed, restore_height, bid_sender):
@@ -661,17 +824,17 @@ class PARTInterfaceAnon(PARTInterface):
         if bid_sender:
             cb_swap_value *= -1
         else:
-            addr_info = self.rpc_callback('getaddressinfo', [sx_addr])
+            addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
             if not addr_info['iswatchonly']:
                 wif_prefix = self.chainparams_network()['key_prefix']
                 wif_scan_key = toWIF(wif_prefix, kbv)
-                self.rpc_callback('importstealthaddress', [wif_scan_key, Kbs.hex()])
+                self.rpc_wallet('importstealthaddress', [wif_scan_key, Kbs.hex()])
                 self._log.info('Imported watch-only sx_addr: {}'.format(sx_addr))
                 self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
-                self.rpc_callback('rescanblockchain', [restore_height])
+                self.rpc_wallet('rescanblockchain', [restore_height])
 
         params = [{'include_watchonly': True, 'search': sx_addr}]
-        txns = self.rpc_callback('filtertransactions', params)
+        txns = self.rpc_wallet('filtertransactions', params)
 
         if len(txns) == 1:
             tx = txns[0]
@@ -681,7 +844,7 @@ class PARTInterfaceAnon(PARTInterface):
             if make_int(tx['outputs'][0]['amount']) == cb_swap_value:
                 height = 0
                 if tx['confirmations'] > 0:
-                    chain_height = self.rpc_callback('getblockcount')
+                    chain_height = self.rpc('getblockcount')
                     height = chain_height - (tx['confirmations'] - 1)
                 return {'txid': tx['txid'], 'amount': cb_swap_value, 'height': height}
             else:
@@ -689,21 +852,21 @@ class PARTInterfaceAnon(PARTInterface):
                 return -1
         return None
 
-    def spendBLockTx(self, chain_b_lock_txid, address_to, kbv, kbs, cb_swap_value, b_fee, restore_height, spend_actual_balance=False):
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee: int, restore_height: int, spend_actual_balance: bool = False) -> bytes:
         Kbv = self.getPubkey(kbv)
         Kbs = self.getPubkey(kbs)
         sx_addr = self.formatStealthAddress(Kbv, Kbs)
-        addr_info = self.rpc_callback('getaddressinfo', [sx_addr])
+        addr_info = self.rpc_wallet('getaddressinfo', [sx_addr])
         if not addr_info['ismine']:
             wif_prefix = self.chainparams_network()['key_prefix']
             wif_scan_key = toWIF(wif_prefix, kbv)
             wif_spend_key = toWIF(wif_prefix, kbs)
-            self.rpc_callback('importstealthaddress', [wif_scan_key, wif_spend_key])
+            self.rpc_wallet('importstealthaddress', [wif_scan_key, wif_spend_key])
             self._log.info('Imported spend key for sx_addr: {}'.format(sx_addr))
             self._log.info('Rescanning {} chain from height: {}'.format(self.coin_name(), restore_height))
-            self.rpc_callback('rescanblockchain', [restore_height])
+            self.rpc_wallet('rescanblockchain', [restore_height])
 
-        autxos = self.rpc_callback('listunspentanon', [1, 9999999, [sx_addr]])
+        autxos = self.rpc_wallet('listunspentanon', [1, 9999999, [sx_addr]])
 
         if len(autxos) < 1:
             raise TemporaryError('No spendable outputs')
@@ -722,14 +885,14 @@ class PARTInterfaceAnon(PARTInterface):
                   [{'address': address_to, 'amount': self.format_amount(cb_swap_value), 'subfee': True}, ],
                   '', '', self._anon_tx_ring_size, 1, False,
                   {'conf_target': self._conf_target, 'inputs': inputs, 'show_fee': True}]
-        rv = self.rpc_callback('sendtypeto', params)
+        rv = self.rpc_wallet('sendtypeto', params)
         return bytes.fromhex(rv['txid'])
 
-    def findTxnByHash(self, txid_hex):
+    def findTxnByHash(self, txid_hex: str):
         # txindex is enabled for Particl
 
         try:
-            rv = self.rpc_callback('getrawtransaction', [txid_hex, True])
+            rv = self.rpc('getrawtransaction', [txid_hex, True])
         except Exception as ex:
             self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
             return None
@@ -739,5 +902,5 @@ class PARTInterfaceAnon(PARTInterface):
 
         return None
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
-        return self.make_int(self.rpc_callback('getbalances')['mine']['anon_trusted'])
+        return self.make_int(self.rpc_wallet('getbalances')['mine']['anon_trusted'])

basicswap/interface/pivx.py

@@ -1,16 +1,28 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020 tecnovert
+# Copyright (c) 2022 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
+from io import BytesIO
+
 from .btc import BTCInterface
+from basicswap.rpc import make_rpc_func
 from basicswap.chainparams import Coins
+from basicswap.util.address import decodeAddress
 from .contrib.pivx_test_framework.messages import (
     CBlock,
     ToHex,
-    FromHex)
+    FromHex,
+    CTransaction)
+from basicswap.contrib.test_framework.script import (
+    CScript,
+    OP_DUP,
+    OP_HASH160,
+    OP_CHECKSIG,
+    OP_EQUALVERIFY,
+)
 
 
 class PIVXInterface(BTCInterface):
@@ -18,30 +30,47 @@ class PIVXInterface(BTCInterface):
     def coin_type():
         return Coins.PIVX
 
-    def createRawSignedTransaction(self, addr_to, amount):
+    def __init__(self, coin_settings, network, swap_client=None):
-        txn = self.rpc_callback('createrawtransaction', [[], {addr_to: self.format_amount(amount)}])
+        super(PIVXInterface, self).__init__(coin_settings, network, swap_client)
+        # 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'])
+
+    def createRawFundedTransaction(self, addr_to: str, amount: int, sub_fee: bool = False, lock_unspents: bool = True) -> str:
+        txn = self.rpc('createrawtransaction', [[], {addr_to: self.format_amount(amount)}])
         fee_rate, fee_src = self.get_fee_rate(self._conf_target)
         self._log.debug(f'Fee rate: {fee_rate}, source: {fee_src}, block target: {self._conf_target}')
-
         options = {
-            'lockUnspents': True,
+            'lockUnspents': lock_unspents,
             'feeRate': fee_rate,
         }
-        txn_funded = self.rpc_callback('fundrawtransaction', [txn, options])['hex']
+        if sub_fee:
-        txn_signed = self.rpc_callback('signrawtransaction', [txn_funded])['hex']
+            options['subtractFeeFromOutputs'] = [0,]
-        return txn_signed
+        return self.rpc('fundrawtransaction', [txn, options])['hex']
+
+    def createRawSignedTransaction(self, addr_to, amount) -> str:
+        txn_funded = self.createRawFundedTransaction(addr_to, amount)
+        return self.rpc('signrawtransaction', [txn_funded])['hex']
+
+    def decodeAddress(self, address):
+        return decodeAddress(address)[1:]
 
     def getBlockWithTxns(self, block_hash):
         # TODO: Bypass decoderawtransaction and getblockheader
-        block = self.rpc_callback('getblock', [block_hash, False])
+        block = self.rpc('getblock', [block_hash, False])
-        block_header = self.rpc_callback('getblockheader', [block_hash])
+        block_header = self.rpc('getblockheader', [block_hash])
         decoded_block = CBlock()
         decoded_block = FromHex(decoded_block, block)
 
         tx_rv = []
         for tx in decoded_block.vtx:
-            tx_dec = self.rpc_callback('decoderawtransaction', [ToHex(tx)])
+            tx_dec = self.rpc('decoderawtransaction', [ToHex(tx)])
             tx_rv.append(tx_dec)
 
         block_rv = {
@@ -57,4 +86,41 @@ class PIVXInterface(BTCInterface):
 
     def withdrawCoin(self, value, addr_to, subfee):
         params = [addr_to, value, '', '', subfee]
-        return self.rpc_callback('sendtoaddress', params)
+        return self.rpc('sendtoaddress', params)
+
+    def getSpendableBalance(self) -> int:
+        return self.make_int(self.rpc('getwalletinfo')['balance'])
+
+    def loadTx(self, tx_bytes):
+        # Load tx from bytes to internal representation
+        tx = CTransaction()
+        tx.deserialize(BytesIO(tx_bytes))
+        return tx
+
+    def getScriptForPubkeyHash(self, pkh: bytes) -> bytearray:
+        # Return P2PKH
+        return CScript([OP_DUP, OP_HASH160, pkh, OP_EQUALVERIFY, OP_CHECKSIG])
+
+    def getBLockSpendTxFee(self, tx, fee_rate: int) -> int:
+        add_bytes = 107
+        size = len(tx.serialize_with_witness()) + add_bytes
+        pay_fee = round(fee_rate * size / 1000)
+        self._log.info(f'BLockSpendTx  fee_rate, size, fee: {fee_rate}, {size}, {pay_fee}.')
+        return pay_fee
+
+    def signTxWithKey(self, tx: bytes, key: bytes) -> bytes:
+        key_wif = self.encodeKey(key)
+        rv = self.rpc('signrawtransaction', [tx.hex(), [], [key_wif, ]])
+        return bytes.fromhex(rv['hex'])
+
+    def findTxnByHash(self, txid_hex: str):
+        # Only works for wallet txns
+        try:
+            rv = self.rpc('gettransaction', [txid_hex])
+        except Exception as ex:
+            self._log.debug('findTxnByHash getrawtransaction failed: {}'.format(txid_hex))
+            return None
+        if 'confirmations' in rv and rv['confirmations'] >= self.blocks_confirmed:
+            block_height = self.getBlockHeader(rv['blockhash'])['height']
+            return {'txid': txid_hex, 'amount': 0, 'height': block_height}
+        return None

basicswap/interface/xmr.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2022 tecnovert
+# Copyright (c) 2020-2024 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -24,21 +24,27 @@ from coincurve.dleag import (
     verify_ed25519_point,
 )
 
+from basicswap.interface import (
+    Curves)
 from basicswap.util import (
+    i2b, b2i, b2h,
     dumpj,
     ensure,
     make_int,
     TemporaryError)
+from basicswap.util.network import (
+    is_private_ip_address)
 from basicswap.rpc_xmr import (
     make_xmr_rpc_func,
-    make_xmr_rpc2_func,
+    make_xmr_rpc2_func)
-    make_xmr_wallet_rpc_func)
-from basicswap.util import (
-    b2i, b2h)
 from basicswap.chainparams import XMR_COIN, CoinInterface, Coins
 
 
 class XMRInterface(CoinInterface):
+    @staticmethod
+    def curve_type():
+        return Curves.ed25519
+
     @staticmethod
     def coin_type():
         return Coins.XMR
@@ -63,17 +69,65 @@ class XMRInterface(CoinInterface):
     def depth_spendable() -> int:
         return 10
 
+    @staticmethod
+    def xmr_swap_a_lock_spend_tx_vsize() -> int:
+        raise ValueError('Not possible')
+
+    @staticmethod
+    def xmr_swap_b_lock_spend_tx_vsize() -> int:
+        # TODO: Estimate with ringsize
+        return 1507
+
     def __init__(self, coin_settings, network, swap_client=None):
         super().__init__(network)
-        self.rpc_cb = make_xmr_rpc_func(coin_settings['rpcport'], host=coin_settings.get('rpchost', '127.0.0.1'))
-        self.rpc_cb2 = make_xmr_rpc2_func(coin_settings['rpcport'], host=coin_settings.get('rpchost', '127.0.0.1'))  # non-json endpoint
-        self.rpc_wallet_cb = make_xmr_wallet_rpc_func(coin_settings['walletrpcport'], coin_settings['walletrpcauth'], host=coin_settings.get('walletrpchost', '127.0.0.1'))
 
         self.blocks_confirmed = coin_settings['blocks_confirmed']
         self._restore_height = coin_settings.get('restore_height', 0)
         self.setFeePriority(coin_settings.get('fee_priority', 0))
         self._sc = swap_client
         self._log = self._sc.log if self._sc and self._sc.log else logging
+        self._wallet_password = None
+        self._have_checked_seed = False
+
+        daemon_login = None
+        if coin_settings.get('rpcuser', '') != '':
+            daemon_login = (coin_settings.get('rpcuser', ''), coin_settings.get('rpcpassword', ''))
+
+        rpchost = coin_settings.get('rpchost', '127.0.0.1')
+        proxy_host = None
+        proxy_port = None
+        # Connect to the daemon over a proxy if not running locally
+        if swap_client:
+            chain_client_settings = swap_client.getChainClientSettings(self.coin_type())
+            manage_daemon: bool = chain_client_settings['manage_daemon']
+            if swap_client.use_tor_proxy:
+                if manage_daemon is False:
+                    log_str: str = ''
+                    have_cc_tor_opt = 'use_tor' in chain_client_settings
+                    if have_cc_tor_opt and chain_client_settings['use_tor'] is False:
+                        log_str = ' bypassing proxy (use_tor false for XMR)'
+                    elif have_cc_tor_opt is False and is_private_ip_address(rpchost):
+                        log_str = ' bypassing proxy (private ip address)'
+                    else:
+                        proxy_host = swap_client.tor_proxy_host
+                        proxy_port = swap_client.tor_proxy_port
+                        log_str = f' through proxy at {proxy_host}'
+                    self._log.info(f'Connecting to remote {self.coin_name()} daemon at {rpchost}{log_str}.')
+                else:
+                    self._log.info(f'Not connecting to local {self.coin_name()} daemon through proxy.')
+            elif manage_daemon is False:
+                self._log.info(f'Connecting to remote {self.coin_name()} daemon at {rpchost}.')
+
+        self._rpctimeout = coin_settings.get('rpctimeout', 60)
+        self._walletrpctimeout = coin_settings.get('walletrpctimeout', 120)
+        self._walletrpctimeoutlong = coin_settings.get('walletrpctimeoutlong', 600)
+
+        self.rpc = make_xmr_rpc_func(coin_settings['rpcport'], daemon_login, host=rpchost, proxy_host=proxy_host, proxy_port=proxy_port, default_timeout=self._rpctimeout, tag='Node(j) ')
+        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')
@@ -82,10 +136,28 @@ class XMRInterface(CoinInterface):
     def setWalletFilename(self, wallet_filename):
         self._wallet_filename = wallet_filename
 
+    def createWallet(self, params):
+        if self._wallet_password is not None:
+            params['password'] = self._wallet_password
+        rv = self.rpc_wallet('generate_from_keys', params)
+        self._log.info('generate_from_keys %s', dumpj(rv))
+
+    def openWallet(self, filename):
+        params = {'filename': filename}
+        if self._wallet_password is not None:
+            params['password'] = self._wallet_password
+
+        try:
+            # Can't reopen the same wallet in windows, !is_keys_file_locked()
+            self.rpc_wallet('close_wallet')
+        except Exception:
+            pass
+        self.rpc_wallet('open_wallet', params)
+
     def initialiseWallet(self, key_view, key_spend, restore_height=None):
         with self._mx_wallet:
             try:
-                self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+                self.openWallet(self._wallet_filename)
                 # TODO: Check address
                 return  # Wallet exists
             except Exception as e:
@@ -102,22 +174,21 @@ class XMRInterface(CoinInterface):
                 'spendkey': b2h(key_spend[::-1]),
                 'restore_height': self._restore_height,
             }
-            rv = self.rpc_wallet_cb('generate_from_keys', params)
+            self.createWallet(params)
-            self._log.info('generate_from_keys %s', dumpj(rv))
+            self.openWallet(self._wallet_filename)
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
 
-    def ensureWalletExists(self):
+    def ensureWalletExists(self) -> None:
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
 
-    def testDaemonRPC(self, with_wallet=True):
+    def testDaemonRPC(self, with_wallet=True) -> None:
-        self.rpc_wallet_cb('get_languages')
+        self.rpc_wallet('get_languages')
 
     def getDaemonVersion(self):
-        return self.rpc_wallet_cb('get_version')['version']
+        return self.rpc_wallet('get_version')['version']
 
     def getBlockchainInfo(self):
-        get_height = self.rpc_cb2('get_height', timeout=30)
+        get_height = self.rpc2('get_height', timeout=self._rpctimeout)
         rv = {
             'blocks': get_height['height'],
             'verificationprogress': 0.0,
@@ -128,7 +199,7 @@ class XMRInterface(CoinInterface):
             # get_block_count returns "Internal error" if bootstrap-daemon is active
             if get_height['untrusted'] is True:
                 rv['bootstrapping'] = True
-                get_info = self.rpc_cb2('get_info', timeout=30)
+                get_info = self.rpc2('get_info', timeout=self._rpctimeout)
                 if 'height_without_bootstrap' in get_info:
                     rv['blocks'] = get_info['height_without_bootstrap']
 
@@ -136,7 +207,7 @@ class XMRInterface(CoinInterface):
                 if rv['known_block_count'] > rv['blocks']:
                     rv['verificationprogress'] = rv['blocks'] / rv['known_block_count']
             else:
-                rv['known_block_count'] = self.rpc_cb('get_block_count', timeout=30)['count']
+                rv['known_block_count'] = self.rpc('get_block_count', timeout=self._rpctimeout)['count']
                 rv['verificationprogress'] = rv['blocks'] / rv['known_block_count']
         except Exception as e:
             self._log.warning('XMR get_block_count failed with: %s', str(e))
@@ -145,48 +216,60 @@ class XMRInterface(CoinInterface):
         return rv
 
     def getChainHeight(self):
-        return self.rpc_cb2('get_height', timeout=30)['height']
+        return self.rpc2('get_height', timeout=self._rpctimeout)['height']
 
     def getWalletInfo(self):
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            try:
+                self.openWallet(self._wallet_filename)
+            except Exception as e:
+                if 'Failed to open wallet' in str(e):
+                    rv = {'encrypted': True, 'locked': True, 'balance': 0, 'unconfirmed_balance': 0}
+                    return rv
+                raise e
+
             rv = {}
-            self.rpc_wallet_cb('refresh')
+            self.rpc_wallet('refresh')
-            balance_info = self.rpc_wallet_cb('get_balance')
+            balance_info = self.rpc_wallet('get_balance')
             rv['balance'] = self.format_amount(balance_info['unlocked_balance'])
             rv['unconfirmed_balance'] = self.format_amount(balance_info['balance'] - balance_info['unlocked_balance'])
+            rv['encrypted'] = False if self._wallet_password is None else True
+            rv['locked'] = False
             return rv
 
     def walletRestoreHeight(self):
         return self._restore_height
 
-    def getMainWalletAddress(self):
+    def getMainWalletAddress(self) -> str:
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
-            return self.rpc_wallet_cb('get_address')['address']
+            return self.rpc_wallet('get_address')['address']
 
-    def getNewAddress(self, placeholder):
+    def getNewAddress(self, placeholder) -> str:
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
-            return self.rpc_wallet_cb('create_address', {'account_index': 0})['address']
+            new_address = self.rpc_wallet('create_address', {'account_index': 0})['address']
+            self.rpc_wallet('store')
+            return new_address
 
-    def get_fee_rate(self, conf_target=2):
+    def get_fee_rate(self, conf_target: int = 2):
-        self._log.warning('TODO - estimate fee rate?')
+        self._log.warning('TODO - estimate XMR fee rate?')
         return 0.0, 'unused'
 
-    def getNewSecretKey(self):
+    def getNewSecretKey(self) -> bytes:
-        return edu.get_secret()
+        # Note: Returned bytes are in big endian order
+        return i2b(edu.get_secret())
 
-    def pubkey(self, key):
+    def pubkey(self, key: bytes) -> bytes:
         return edf.scalarmult_B(key)
 
-    def encodeKey(self, vk):
+    def encodeKey(self, vk: bytes) -> str:
         return vk[::-1].hex()
 
-    def decodeKey(self, k_hex):
+    def decodeKey(self, k_hex: str) -> bytes:
         return bytes.fromhex(k_hex)[::-1]
 
-    def encodePubkey(self, pk):
+    def encodePubkey(self, pk: bytes) -> str:
         return edu.encodepoint(pk)
 
     def decodePubkey(self, pke):
@@ -195,12 +278,12 @@ class XMRInterface(CoinInterface):
     def getPubkey(self, privkey):
         return ed25519_get_pubkey(privkey)
 
-    def getAddressFromKeys(self, key_view, key_spend):
+    def getAddressFromKeys(self, key_view: bytes, key_spend: bytes) -> str:
         pk_view = self.getPubkey(key_view)
         pk_spend = self.getPubkey(key_spend)
         return xmr_util.encode_address(pk_view, pk_spend)
 
-    def verifyKey(self, k):
+    def verifyKey(self, k: int) -> bool:
         i = b2i(k)
         return (i < edf.l and i > 8)
 
@@ -209,43 +292,45 @@ class XMRInterface(CoinInterface):
         # Checks for small order
         return verify_ed25519_point(pubkey_bytes)
 
-    def proveDLEAG(self, key):
+    def proveDLEAG(self, key: bytes) -> bytes:
         privkey = PrivateKey(key)
         return dleag_prove(privkey)
 
-    def verifyDLEAG(self, dleag_bytes):
+    def verifyDLEAG(self, dleag_bytes: bytes) -> bool:
         return dleag_verify(dleag_bytes)
 
-    def lengthDLEAG(self):
+    def lengthDLEAG(self) -> int:
         return dleag_proof_len()
 
-    def sumKeys(self, ka, kb):
+    def sumKeys(self, ka: bytes, kb: bytes) -> bytes:
         return ed25519_scalar_add(ka, kb)
 
-    def sumPubkeys(self, Ka, Kb):
+    def sumPubkeys(self, Ka: bytes, Kb: bytes) -> bytes:
         return ed25519_add(Ka, Kb)
 
-    def encodeSharedAddress(self, Kbv, Kbs):
+    def encodeSharedAddress(self, Kbv: bytes, Kbs: bytes) -> str:
         return xmr_util.encode_address(Kbv, Kbs)
 
-    def publishBLockTx(self, Kbv, Kbs, output_amount, feerate, delay_for=10):
+    def publishBLockTx(self, kbv: bytes, Kbs: bytes, output_amount: int, feerate: int, delay_for: int = 10, unlock_time: int = 0) -> bytes:
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
+            self.rpc_wallet('refresh')
 
+            Kbv = self.getPubkey(kbv)
             shared_addr = xmr_util.encode_address(Kbv, Kbs)
 
-            params = {'destinations': [{'amount': output_amount, 'address': shared_addr}]}
+            params = {'destinations': [{'amount': output_amount, 'address': shared_addr}], 'unlock_time': unlock_time}
             if self._fee_priority > 0:
                 params['priority'] = self._fee_priority
-            rv = self.rpc_wallet_cb('transfer', params)
+            rv = self.rpc_wallet('transfer', params)
             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():
-                    params = {'out': True, 'pending': True, 'failed': True, 'pool': True, }
+                    gt_params = {'out': True, 'pending': True, 'failed': True, 'pool': True, }
-                    rv = self.rpc_wallet_cb('get_transfers', params)
+                    rv = self.rpc_wallet('get_transfers', gt_params)
                     self._log.debug('get_transfers {}'.format(dumpj(rv)))
                     if 'pending' not in rv:
                         break
@@ -260,11 +345,6 @@ class XMRInterface(CoinInterface):
             Kbv = self.getPubkey(kbv)
             address_b58 = xmr_util.encode_address(Kbv, Kbs)
 
-            try:
-                self.rpc_wallet_cb('close_wallet')
-            except Exception as e:
-                self._log.warning('close_wallet failed %s', str(e))
-
             kbv_le = kbv[::-1]
             params = {
                 'restore_height': restore_height,
@@ -274,111 +354,57 @@ class XMRInterface(CoinInterface):
             }
 
             try:
-                rv = self.rpc_wallet_cb('open_wallet', {'filename': address_b58})
+                self.openWallet(address_b58)
             except Exception as e:
-                rv = self.rpc_wallet_cb('generate_from_keys', params)
+                self.createWallet(params)
-                self._log.info('generate_from_keys %s', dumpj(rv))
+                self.openWallet(address_b58)
-                rv = self.rpc_wallet_cb('open_wallet', {'filename': address_b58})
 
-            self.rpc_wallet_cb('refresh', timeout=600)
+            self.rpc_wallet('refresh', timeout=self._walletrpctimeoutlong)
 
             '''
             # Debug
             try:
-                current_height = self.rpc_wallet_cb('get_height')['height']
+                current_height = self.rpc_wallet('get_height')['height']
                 self._log.info('findTxB XMR current_height %d\nAddress: %s', current_height, address_b58)
             except Exception as e:
-                self._log.info('rpc_cb failed %s', str(e))
+                self._log.info('rpc failed %s', str(e))
                 current_height = None  # If the transfer is available it will be deep enough
                 #   and (current_height is None or current_height - transfer['block_height'] > cb_block_confirmed):
             '''
             params = {'transfer_type': 'available'}
-            rv = self.rpc_wallet_cb('incoming_transfers', params)
+            transfers = self.rpc_wallet('incoming_transfers', params)
-            if 'transfers' in rv:
+            rv = None
-                for transfer in rv['transfers']:
+            if 'transfers' in transfers:
+                for transfer in transfers['transfers']:
+                    # unlocked <- wallet->is_transfer_unlocked() checks unlock_time and CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE
+                    if not transfer['unlocked']:
+                        full_tx = self.rpc_wallet('get_transfer_by_txid', {'txid': transfer['tx_hash']})
+                        unlock_time = full_tx['transfer']['unlock_time']
+                        if unlock_time != 0:
+                            self._log.warning('Coin b lock txn is locked: {}, unlock_time {}'.format(transfer['tx_hash'], unlock_time))
+                            rv = -1
+                            continue
                     if transfer['amount'] == cb_swap_value:
                         return {'txid': transfer['tx_hash'], 'amount': transfer['amount'], 'height': 0 if 'block_height' not in transfer else transfer['block_height']}
                     else:
                         self._log.warning('Incorrect amount detected for coin b lock txn: {}'.format(transfer['tx_hash']))
-                        return -1
+                        rv = -1
-            return None
+            return rv
-
-    def waitForLockTxB(self, kbv, Kbs, cb_swap_value, cb_block_confirmed, restore_height):
-        with self._mx_wallet:
-            Kbv_enc = self.encodePubkey(self.pubkey(kbv))
-            address_b58 = xmr_util.encode_address(Kbv_enc, self.encodePubkey(Kbs))
-
-            try:
-                self.rpc_wallet_cb('close_wallet')
-            except Exception as e:
-                self._log.warning('close_wallet failed %s', str(e))
-
-            params = {
-                'filename': address_b58,
-                'address': address_b58,
-                'viewkey': b2h(kbv[::-1]),
-                'restore_height': restore_height,
-            }
-            self.rpc_wallet_cb('generate_from_keys', params)
-
-            self.rpc_wallet_cb('open_wallet', {'filename': address_b58})
-            # For a while after opening the wallet rpc cmds return empty data
-
-            num_tries = 40
-            for i in range(num_tries + 1):
-                try:
-                    current_height = self.rpc_cb2('get_height')['height']
-                    print('current_height', current_height)
-                except Exception as e:
-                    self._log.warning('rpc_cb failed %s', str(e))
-                    current_height = None  # If the transfer is available it will be deep enough
-
-                # TODO: Make accepting current_height == None a user selectable option
-                #       Or look for all transfers and check height
-
-                params = {'transfer_type': 'available'}
-                rv = self.rpc_wallet_cb('incoming_transfers', params)
-                print('rv', rv)
-
-                if 'transfers' in rv:
-                    for transfer in rv['transfers']:
-                        if transfer['amount'] == cb_swap_value \
-                           and (current_height is None or current_height - transfer['block_height'] > cb_block_confirmed):
-                            return True
-
-                # TODO: Is it necessary to check the address?
-                '''
-                rv = self.rpc_wallet_cb('get_balance')
-                print('get_balance', rv)
-
-                if 'per_subaddress' in rv:
-                    for sub_addr in rv['per_subaddress']:
-                        if sub_addr['address'] == address_b58:
-
-                '''
-
-                if i >= num_tries:
-                    raise ValueError('Balance not confirming on node')
-                self._sc.delay_event.wait(1.0)
-                if self._sc.delay_event.is_set():
-                    raise ValueError('Stopped')
-
-            return False
 
     def findTxnByHash(self, txid):
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
-            self.rpc_wallet_cb('refresh')
+            self.rpc_wallet('refresh', timeout=self._walletrpctimeoutlong)
 
             try:
-                current_height = self.rpc_cb2('get_height', timeout=30)['height']
+                current_height = self.rpc2('get_height', timeout=self._rpctimeout)['height']
                 self._log.info('findTxnByHash XMR current_height %d\nhash: %s', current_height, txid)
             except Exception as e:
-                self._log.info('rpc_cb failed %s', str(e))
+                self._log.info('rpc failed %s', str(e))
                 current_height = None  # If the transfer is available it will be deep enough
 
             params = {'transfer_type': 'available'}
-            rv = self.rpc_wallet_cb('incoming_transfers', params)
+            rv = self.rpc_wallet('incoming_transfers', params)
             if 'transfers' in rv:
                 for transfer in rv['transfers']:
                     if transfer['tx_hash'] == txid \
@@ -387,17 +413,16 @@ class XMRInterface(CoinInterface):
 
             return None
 
-    def spendBLockTx(self, chain_b_lock_txid, address_to, kbv, kbs, cb_swap_value, b_fee_rate, restore_height, spend_actual_balance=False):
+    def spendBLockTx(self, chain_b_lock_txid: bytes, address_to: str, kbv: bytes, kbs: bytes, cb_swap_value: int, b_fee_rate: int, restore_height: int, spend_actual_balance: bool = False) -> bytes:
+        '''
+        Notes:
+        "Error: No unlocked balance in the specified subaddress(es)" can mean not enough funds after tx fee.
+        '''
         with self._mx_wallet:
             Kbv = self.getPubkey(kbv)
             Kbs = self.getPubkey(kbs)
             address_b58 = xmr_util.encode_address(Kbv, Kbs)
 
-            try:
-                self.rpc_wallet_cb('close_wallet')
-            except Exception as e:
-                self._log.warning('close_wallet failed %s', str(e))
-
             wallet_filename = address_b58 + '_spend'
 
             params = {
@@ -409,18 +434,16 @@ class XMRInterface(CoinInterface):
             }
 
             try:
-                self.rpc_wallet_cb('open_wallet', {'filename': wallet_filename})
+                self.openWallet(wallet_filename)
             except Exception as e:
-                rv = self.rpc_wallet_cb('generate_from_keys', params)
+                self.createWallet(params)
-                self._log.info('generate_from_keys %s', dumpj(rv))
+                self.openWallet(wallet_filename)
-                self.rpc_wallet_cb('open_wallet', {'filename': wallet_filename})
-
-            self.rpc_wallet_cb('refresh')
-            rv = self.rpc_wallet_cb('get_balance')
 
+            self.rpc_wallet('refresh')
+            rv = self.rpc_wallet('get_balance')
             if rv['balance'] < cb_swap_value:
                 self._log.warning('Balance is too low, checking for existing spend.')
-                txns = self.rpc_wallet_cb('get_transfers', {'out': True})
+                txns = self.rpc_wallet('get_transfers', {'out': True})
                 if 'out' in txns:
                     txns = txns['out']
                     if len(txns) > 0:
@@ -445,57 +468,106 @@ class XMRInterface(CoinInterface):
             if self._fee_priority > 0:
                 params['priority'] = self._fee_priority
 
-            rv = self.rpc_wallet_cb('sweep_all', params)
+            rv = self.rpc_wallet('sweep_all', params)
             self._log.debug('sweep_all {}'.format(json.dumps(rv)))
 
             return bytes.fromhex(rv['tx_hash_list'][0])
 
-    def withdrawCoin(self, value, addr_to, subfee):
+    def withdrawCoin(self, value: int, addr_to: str, subfee: bool) -> str:
         with self._mx_wallet:
             value_sats = make_int(value, self.exp())
 
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
+            self.rpc_wallet('refresh')
 
             if subfee:
-                balance = self.rpc_wallet_cb('get_balance')
+                balance = self.rpc_wallet('get_balance')
-                if balance['unlocked_balance'] - value_sats <= 10:
+                diff = balance['unlocked_balance'] - value_sats
+                if diff >= 0 and diff <= 10:
                     self._log.info('subfee enabled and value close to total, using sweep_all.')
                     params = {'address': addr_to}
                     if self._fee_priority > 0:
                         params['priority'] = self._fee_priority
-                    rv = self.rpc_wallet_cb('sweep_all', params)
+                    rv = self.rpc_wallet('sweep_all', params)
                     return rv['tx_hash_list'][0]
                 raise ValueError('Withdraw value must be close to total to use subfee/sweep_all.')
 
             params = {'destinations': [{'amount': value_sats, 'address': addr_to}]}
             if self._fee_priority > 0:
                 params['priority'] = self._fee_priority
-            rv = self.rpc_wallet_cb('transfer', params)
+            rv = self.rpc_wallet('transfer', params)
             return rv['tx_hash']
 
-    def showLockTransfers(self, Kbv, Kbs):
+    def showLockTransfers(self, kbv, Kbs, restore_height):
         with self._mx_wallet:
             try:
+                Kbv = self.getPubkey(kbv)
                 address_b58 = xmr_util.encode_address(Kbv, Kbs)
                 wallet_file = address_b58 + '_spend'
                 try:
-                    self.rpc_wallet_cb('open_wallet', {'filename': wallet_file})
+                    self.openWallet(wallet_file)
                 except Exception:
                     wallet_file = address_b58
-                    self.rpc_wallet_cb('open_wallet', {'filename': wallet_file})
+                    try:
+                        self.openWallet(wallet_file)
+                    except Exception:
+                        self._log.info(f'showLockTransfers trying to create wallet for address {address_b58}.')
+                        kbv_le = kbv[::-1]
+                        params = {
+                            'restore_height': restore_height,
+                            'filename': address_b58,
+                            'address': address_b58,
+                            'viewkey': b2h(kbv_le),
+                        }
+                        self.createWallet(params)
+                        self.openWallet(address_b58)
 
-                self.rpc_wallet_cb('refresh')
+                self.rpc_wallet('refresh')
 
-                rv = self.rpc_wallet_cb('get_transfers', {'in': True, 'out': True, 'pending': True, 'failed': True})
+                rv = self.rpc_wallet('get_transfers', {'in': True, 'out': True, 'pending': True, 'failed': True})
                 rv['filename'] = wallet_file
                 return rv
             except Exception as e:
                 return {'error': str(e)}
 
-    def getSpendableBalance(self):
+    def getSpendableBalance(self) -> int:
         with self._mx_wallet:
-            self.rpc_wallet_cb('open_wallet', {'filename': self._wallet_filename})
+            self.openWallet(self._wallet_filename)
 
-            self.rpc_wallet_cb('refresh')
+            self.rpc_wallet('refresh')
-            balance_info = self.rpc_wallet_cb('get_balance')
+            balance_info = self.rpc_wallet('get_balance')
             return balance_info['unlocked_balance']
+
+    def changeWalletPassword(self, old_password, new_password):
+        self._log.info('changeWalletPassword - {}'.format(self.ticker()))
+        orig_password = self._wallet_password
+        if old_password != '':
+            self._wallet_password = old_password
+        try:
+            self.openWallet(self._wallet_filename)
+            self.rpc_wallet('change_wallet_password', {'old_password': old_password, 'new_password': new_password})
+        except Exception as e:
+            self._wallet_password = orig_password
+            raise e
+
+    def unlockWallet(self, password: str) -> None:
+        self._log.info('unlockWallet - {}'.format(self.ticker()))
+        self._wallet_password = password
+
+        if not self._have_checked_seed:
+            self._sc.checkWalletSeed(self.coin_type())
+
+    def lockWallet(self) -> None:
+        self._log.info('lockWallet - {}'.format(self.ticker()))
+        self._wallet_password = None
+
+    def isAddressMine(self, address):
+        # TODO
+        return True
+
+    def ensureFunds(self, amount: int) -> None:
+        if self.getSpendableBalance() < amount:
+            raise ValueError('Balance too low')
+
+    def getTransaction(self, txid: bytes):
+        return self.rpc2('get_transactions', {'txs_hashes': [txid.hex(), ]})

basicswap/js_server.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2022 tecnovert
+# Copyright (c) 2020-2024 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -9,6 +9,7 @@ import random
 import urllib.parse
 
 from .util import (
+    ensure,
     toBool,
 )
 from .basicswap_util import (
@@ -22,6 +23,7 @@ from .chainparams import (
 )
 from .ui.util import (
     PAGE_LIMIT,
+    getCoinName,
     getCoinType,
     inputAmount,
     describeBid,
@@ -31,22 +33,25 @@ from .ui.util import (
     have_data_entry,
     tickerToCoinId,
     listOldBidStates,
+    checkAddressesOwned,
 )
 from .ui.page_offers import postNewOffer
 from .protocols.xmr_swap_1 import recoverNoScriptTxnWithKey, getChainBSplitKey
 
 
-def js_error(self, error_str):
+def getFormData(post_string: str, is_json: bool):
-    error_str_json = json.dumps({'error': error_str})
+    if post_string == '':
-    return bytes(error_str_json, 'UTF-8')
+        raise ValueError('No post data')
+    if is_json:
+        form_data = json.loads(post_string)
+        form_data['is_json'] = True
+    else:
+        form_data = urllib.parse.parse_qs(post_string)
+    return form_data
 
 
 def withdraw_coin(swap_client, coin_type, post_string, is_json):
-    if is_json:
+    post_data = getFormData(post_string, is_json)
-        post_data = json.loads(post_string)
-        post_data['is_json'] = True
-    else:
-        post_data = urllib.parse.parse_qs(post_string)
 
     value = get_data_entry(post_data, 'value')
     address = get_data_entry(post_data, 'address')
@@ -58,28 +63,43 @@ def withdraw_coin(swap_client, coin_type, post_string, is_json):
         type_from = get_data_entry_or(post_data, 'type_from', 'plain')
         type_to = get_data_entry_or(post_data, 'type_to', 'plain')
         txid_hex = swap_client.withdrawParticl(type_from, type_to, value, address, subfee)
+    elif coin_type == Coins.LTC:
+        type_from = get_data_entry_or(post_data, 'type_from', 'plain')
+        txid_hex = swap_client.withdrawLTC(type_from, value, address, subfee)
     else:
         txid_hex = swap_client.withdrawCoin(coin_type, value, address, subfee)
 
     return {'txid': txid_hex}
 
 
-def js_coins(self, url_split, post_string, is_json):
+def js_error(self, error_str) -> bytes:
+    error_str_json = json.dumps({'error': error_str})
+    return bytes(error_str_json, 'UTF-8')
+
+
+def js_coins(self, url_split, post_string, is_json) -> bytes:
     swap_client = self.server.swap_client
 
     coins = []
     for coin in Coins:
         cc = swap_client.coin_clients[coin]
+        coin_chainparams = chainparams[cc['coin']]
+        coin_active: bool = False if cc['connection_type'] == 'none' else True
+        if coin == Coins.LTC_MWEB:
+            coin_active = False
         entry = {
             'id': int(coin),
-            'ticker': chainparams[cc['coin']]['ticker'],
+            'ticker': coin_chainparams['ticker'],
-            'name': cc['name'].capitalize(),
+            'name': getCoinName(coin),
-            'active': False if cc['connection_type'] == 'none' else True,
+            'active': coin_active,
+            'decimal_places': coin_chainparams['decimal_places'],
         }
         if coin == Coins.PART_ANON:
             entry['variant'] = 'Anon'
         elif coin == Coins.PART_BLIND:
             entry['variant'] = 'Blind'
+        elif coin == Coins.LTC_MWEB:
+            entry['variant'] = 'MWEB'
         coins.append(entry)
 
     return bytes(json.dumps(coins), 'UTF-8')
@@ -87,6 +107,7 @@ def js_coins(self, url_split, post_string, is_json):
 
 def js_wallets(self, url_split, post_string, is_json):
     swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
     if len(url_split) > 3:
         ticker_str = url_split[3]
         coin_type = tickerToCoinId(ticker_str)
@@ -95,33 +116,52 @@ def js_wallets(self, url_split, post_string, is_json):
             cmd = url_split[4]
             if cmd == 'withdraw':
                 return bytes(json.dumps(withdraw_coin(swap_client, coin_type, post_string, is_json)), 'UTF-8')
-            if cmd == 'nextdepositaddr':
+            elif cmd == 'nextdepositaddr':
                 return bytes(json.dumps(swap_client.cacheNewAddressForCoin(coin_type)), 'UTF-8')
+            elif cmd == 'createutxo':
+                post_data = getFormData(post_string, is_json)
+                ci = swap_client.ci(coin_type)
+                value = ci.make_int(get_data_entry(post_data, 'value'))
+                txid_hex, new_addr = ci.createUTXO(value)
+                return bytes(json.dumps({'txid': txid_hex, 'address': new_addr}), 'UTF-8')
+            elif cmd == 'reseed':
+                swap_client.reseedWallet(coin_type)
+                return bytes(json.dumps({'reseeded': True}), 'UTF-8')
+            elif cmd == 'newstealthaddress':
+                if coin_type != Coins.PART:
+                    raise ValueError('Invalid coin for command')
+                return bytes(json.dumps(swap_client.ci(coin_type).getNewStealthAddress()), 'UTF-8')
+            elif cmd == 'newmwebaddress':
+                if coin_type not in (Coins.LTC, Coins.LTC_MWEB):
+                    raise ValueError('Invalid coin for command')
+                return bytes(json.dumps(swap_client.ci(coin_type).getNewMwebAddress()), 'UTF-8')
+
             raise ValueError('Unknown command')
 
+        if coin_type == Coins.LTC_MWEB:
+            coin_type = Coins.LTC
         rv = swap_client.getWalletInfo(coin_type)
         rv.update(swap_client.getBlockchainInfo(coin_type))
+        ci = swap_client.ci(coin_type)
+        checkAddressesOwned(swap_client, ci, rv)
         return bytes(json.dumps(rv), 'UTF-8')
-    return bytes(json.dumps(self.server.swap_client.getWalletsInfo({'ticker_key': True})), 'UTF-8')
+
+    return bytes(json.dumps(swap_client.getWalletsInfo({'ticker_key': True})), 'UTF-8')
 
 
-def js_offers(self, url_split, post_string, is_json, sent=False):
+def js_offers(self, url_split, post_string, is_json, sent=False) -> bytes:
     swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
     offer_id = None
     if len(url_split) > 3:
         if url_split[3] == 'new':
-            if post_string == '':
+            form_data = getFormData(post_string, is_json)
-                raise ValueError('No post data')
-            if is_json:
-                form_data = json.loads(post_string)
-                form_data['is_json'] = True
-            else:
-                form_data = urllib.parse.parse_qs(post_string)
             offer_id = postNewOffer(swap_client, form_data)
             rv = {'offer_id': offer_id.hex()}
             return bytes(json.dumps(rv), 'UTF-8')
         offer_id = bytes.fromhex(url_split[3])
 
+    with_extra_info = False
     filters = {
         'coin_from': -1,
         'coin_to': -1,
@@ -135,11 +175,7 @@ def js_offers(self, url_split, post_string, is_json, sent=False):
         filters['offer_id'] = offer_id
 
     if post_string != '':
-        if is_json:
+        post_data = getFormData(post_string, is_json)
-            post_data = json.loads(post_string)
-            post_data['is_json'] = True
-        else:
-            post_data = urllib.parse.parse_qs(post_string)
         filters['coin_from'] = setCoinFilter(post_data, 'coin_from')
         filters['coin_to'] = setCoinFilter(post_data, 'coin_to')
 
@@ -152,18 +188,26 @@ def js_offers(self, url_split, post_string, is_json, sent=False):
             assert (sort_dir in ['asc', 'desc']), 'Invalid sort dir'
             filters['sort_dir'] = sort_dir
 
-        if b'offset' in post_data:
+        if have_data_entry(post_data, 'offset'):
             filters['offset'] = int(get_data_entry(post_data, 'offset'))
-        if b'limit' in post_data:
+        if have_data_entry(post_data, 'limit'):
             filters['limit'] = int(get_data_entry(post_data, 'limit'))
             assert (filters['limit'] > 0 and filters['limit'] <= PAGE_LIMIT), 'Invalid limit'
+        if have_data_entry(post_data, 'active'):
+            filters['active'] = get_data_entry(post_data, 'active')
+        if have_data_entry(post_data, 'include_sent'):
+            filters['include_sent'] = toBool(get_data_entry(post_data, 'include_sent'))
 
-    offers = self.server.swap_client.listOffers(sent, filters)
+        if have_data_entry(post_data, 'with_extra_info'):
+            with_extra_info = toBool(get_data_entry(post_data, 'with_extra_info'))
+
+    offers = swap_client.listOffers(sent, filters)
     rv = []
     for o in offers:
-        ci_from = self.server.swap_client.ci(o.coin_from)
+        ci_from = swap_client.ci(o.coin_from)
-        ci_to = self.server.swap_client.ci(o.coin_to)
+        ci_to = swap_client.ci(o.coin_to)
-        rv.append({
+        offer_data = {
+            'swap_type': o.swap_type,
             'addr_from': o.addr_from,
             'addr_to': o.addr_to,
             'offer_id': o.offer_id.hex(),
@@ -174,26 +218,90 @@ def js_offers(self, url_split, post_string, is_json, sent=False):
             'amount_from': ci_from.format_amount(o.amount_from),
             'amount_to': ci_to.format_amount((o.amount_from * o.rate) // ci_from.COIN()),
             'rate': ci_to.format_amount(o.rate),
-        })
+        }
+        if with_extra_info:
+            offer_data['amount_negotiable'] = o.amount_negotiable
+            offer_data['rate_negotiable'] = o.rate_negotiable
 
+            if o.swap_type == SwapTypes.XMR_SWAP:
+                _, xmr_offer = swap_client.getXmrOffer(o.offer_id)
+                offer_data['lock_time_1'] = xmr_offer.lock_time_1
+                offer_data['lock_time_2'] = xmr_offer.lock_time_2
+
+                offer_data['feerate_from'] = xmr_offer.a_fee_rate
+                offer_data['feerate_to'] = xmr_offer.b_fee_rate
+            else:
+                offer_data['feerate_from'] = o.from_feerate
+                offer_data['feerate_to'] = o.to_feerate
+
+        rv.append(offer_data)
     return bytes(json.dumps(rv), 'UTF-8')
 
 
-def js_sentoffers(self, url_split, post_string, is_json):
+def js_sentoffers(self, url_split, post_string, is_json) -> bytes:
-    return self.js_offers(url_split, post_string, is_json, True)
+    return js_offers(self, url_split, post_string, is_json, True)
 
 
-def js_bids(self, url_split, post_string, is_json):
+def parseBidFilters(post_data):
+    offer_id = None
+    filters = {}
+
+    if have_data_entry(post_data, 'offer_id'):
+        offer_id = bytes.fromhex(get_data_entry(post_data, 'offer_id'))
+        assert (len(offer_id) == 28)
+
+    if have_data_entry(post_data, 'sort_by'):
+        sort_by = get_data_entry(post_data, 'sort_by')
+        assert (sort_by in ['created_at', ]), 'Invalid sort by'
+        filters['sort_by'] = sort_by
+    if have_data_entry(post_data, 'sort_dir'):
+        sort_dir = get_data_entry(post_data, 'sort_dir')
+        assert (sort_dir in ['asc', 'desc']), 'Invalid sort dir'
+        filters['sort_dir'] = sort_dir
+
+    if have_data_entry(post_data, 'offset'):
+        filters['offset'] = int(get_data_entry(post_data, 'offset'))
+    if have_data_entry(post_data, 'limit'):
+        filters['limit'] = int(get_data_entry(post_data, 'limit'))
+        assert (filters['limit'] > 0 and filters['limit'] <= PAGE_LIMIT), 'Invalid limit'
+
+    if have_data_entry(post_data, 'with_available_or_active'):
+        filters['with_available_or_active'] = toBool(get_data_entry(post_data, 'with_available_or_active'))
+    elif have_data_entry(post_data, 'with_expired'):
+        filters['with_expired'] = toBool(get_data_entry(post_data, 'with_expired'))
+
+    if have_data_entry(post_data, 'with_extra_info'):
+        filters['with_extra_info'] = toBool(get_data_entry(post_data, 'with_extra_info'))
+
+    return offer_id, filters
+
+
+def formatBids(swap_client, bids, filters) -> bytes:
+    with_extra_info = filters.get('with_extra_info', False)
+    rv = []
+    for b in bids:
+        bid_data = {
+            'bid_id': b[2].hex(),
+            'offer_id': b[3].hex(),
+            'created_at': b[0],
+            'expire_at': b[1],
+            'coin_from': b[9],
+            'amount_from': swap_client.ci(b[9]).format_amount(b[4]),
+            'bid_rate': swap_client.ci(b[14]).format_amount(b[10]),
+            'bid_state': strBidState(b[5])
+        }
+        if with_extra_info:
+            bid_data['addr_from'] = b[11]
+        rv.append(bid_data)
+    return bytes(json.dumps(rv), 'UTF-8')
+
+
+def js_bids(self, url_split, post_string: str, is_json: bool) -> bytes:
     swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
     if len(url_split) > 3:
         if url_split[3] == 'new':
-            if post_string == '':
+            post_data = getFormData(post_string, is_json)
-                raise ValueError('No post data')
-            if is_json:
-                post_data = json.loads(post_string)
-                post_data['is_json'] = True
-            else:
-                post_data = urllib.parse.parse_qs(post_string)
 
             offer_id = bytes.fromhex(get_data_entry(post_data, 'offer_id'))
             assert (len(offer_id) == 28)
@@ -240,17 +348,19 @@ def js_bids(self, url_split, post_string, is_json):
         bid_id = bytes.fromhex(url_split[3])
         assert (len(bid_id) == 28)
 
+        show_txns = False
         if post_string != '':
-            if is_json:
+            post_data = getFormData(post_string, is_json)
-                post_data = json.loads(post_string)
-                post_data['is_json'] = True
-            else:
-                post_data = urllib.parse.parse_qs(post_string)
             if have_data_entry(post_data, 'accept'):
                 swap_client.acceptBid(bid_id)
+            elif have_data_entry(post_data, 'abandon'):
+                swap_client.abandonBid(bid_id)
             elif have_data_entry(post_data, 'debugind'):
                 swap_client.setBidDebugInd(bid_id, int(get_data_entry(post_data, 'debugind')))
 
+            if have_data_entry(post_data, 'show_extra'):
+                show_txns = True
+
         bid, xmr_swap, offer, xmr_offer, events = swap_client.getXmrBidAndOffer(bid_id)
         assert (bid), 'Unknown bid ID'
 
@@ -266,47 +376,46 @@ def js_bids(self, url_split, post_string, is_json):
             return bytes(json.dumps(old_states), 'UTF-8')
 
         edit_bid = False
-        show_txns = False
         data = describeBid(swap_client, bid, xmr_swap, offer, xmr_offer, events, edit_bid, show_txns, for_api=True)
         return bytes(json.dumps(data), 'UTF-8')
 
-    bids = swap_client.listBids()
+    post_data = {} if post_string == '' else getFormData(post_string, is_json)
-    return bytes(json.dumps([{
+    offer_id, filters = parseBidFilters(post_data)
-        'bid_id': b[2].hex(),
+
-        'offer_id': b[3].hex(),
+    bids = swap_client.listBids(offer_id=offer_id, filters=filters)
-        'created_at': b[0],
+    return formatBids(swap_client, bids, filters)
-        'expire_at': b[1],
-        'coin_from': b[9],
-        'amount_from': swap_client.ci(b[9]).format_amount(b[4]),
-        'bid_state': strBidState(b[5])
-    } for b in bids]), 'UTF-8')
 
 
-def js_sentbids(self, url_split, post_string, is_json):
+def js_sentbids(self, url_split, post_string, is_json) -> bytes:
-    return bytes(json.dumps(self.server.swap_client.listBids(sent=True)), 'UTF-8')
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+    post_data = getFormData(post_string, is_json)
+    offer_id, filters = parseBidFilters(post_data)
+
+    bids = swap_client.listBids(sent=True, offer_id=offer_id, filters=filters)
+    return formatBids(swap_client, bids, filters)
 
 
-def js_network(self, url_split, post_string, is_json):
+def js_network(self, url_split, post_string, is_json) -> bytes:
-    return bytes(json.dumps(self.server.swap_client.get_network_info()), 'UTF-8')
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+    return bytes(json.dumps(swap_client.get_network_info()), 'UTF-8')
 
 
-def js_revokeoffer(self, url_split, post_string, is_json):
+def js_revokeoffer(self, url_split, post_string, is_json) -> bytes:
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
     offer_id = bytes.fromhex(url_split[3])
     assert (len(offer_id) == 28)
-    self.server.swap_client.revokeOffer(offer_id)
+    swap_client.revokeOffer(offer_id)
     return bytes(json.dumps({'revoked_offer': offer_id.hex()}), 'UTF-8')
 
 
-def js_smsgaddresses(self, url_split, post_string, is_json):
+def js_smsgaddresses(self, url_split, post_string, is_json) -> bytes:
     swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+    post_data = {} if post_string == '' else getFormData(post_string, is_json)
     if len(url_split) > 3:
-        if post_string == '':
-            raise ValueError('No post data')
-        if is_json:
-            post_data = json.loads(post_string)
-            post_data['is_json'] = True
-        else:
-            post_data = urllib.parse.parse_qs(post_string)
         if url_split[3] == 'new':
             addressnote = get_data_entry_or(post_data, 'addressnote', '')
             new_addr, pubkey = swap_client.newSMSGAddress(addressnote=addressnote)
@@ -323,17 +432,15 @@ def js_smsgaddresses(self, url_split, post_string, is_json):
             new_addr = swap_client.editSMSGAddress(address, activeind, addressnote)
             return bytes(json.dumps({'edited_address': address}), 'UTF-8')
 
-    return bytes(json.dumps(swap_client.listAllSMSGAddresses()), 'UTF-8')
+    filters = {
+        'exclude_inactive': post_data.get('exclude_inactive', True),
+    }
+
+    return bytes(json.dumps(swap_client.listAllSMSGAddresses(filters)), 'UTF-8')
 
 
-def js_rates(self, url_split, post_string, is_json):
+def js_rates(self, url_split, post_string, is_json) -> bytes:
-    if post_string == '':
+    post_data = getFormData(post_string, is_json)
-        raise ValueError('No post data')
-    if is_json:
-        post_data = json.loads(post_string)
-        post_data['is_json'] = True
-    else:
-        post_data = urllib.parse.parse_qs(post_string)
 
     sc = self.server.swap_client
     coin_from = get_data_entry(post_data, 'coin_from')
@@ -341,7 +448,7 @@ def js_rates(self, url_split, post_string, is_json):
     return bytes(json.dumps(sc.lookupRates(coin_from, coin_to)), 'UTF-8')
 
 
-def js_rates_list(self, url_split, query_string, is_json):
+def js_rates_list(self, url_split, query_string, is_json) -> bytes:
     get_data = urllib.parse.parse_qs(query_string)
 
     sc = self.server.swap_client
@@ -350,14 +457,8 @@ def js_rates_list(self, url_split, query_string, is_json):
     return bytes(json.dumps(sc.lookupRates(coin_from, coin_to, True)), 'UTF-8')
 
 
-def js_rate(self, url_split, post_string, is_json):
+def js_rate(self, url_split, post_string, is_json) -> bytes:
-    if post_string == '':
+    post_data = getFormData(post_string, is_json)
-        raise ValueError('No post data')
-    if is_json:
-        post_data = json.loads(post_string)
-        post_data['is_json'] = True
-    else:
-        post_data = urllib.parse.parse_qs(post_string)
 
     sc = self.server.swap_client
     coin_from = getCoinType(get_data_entry(post_data, 'coin_from'))
@@ -389,11 +490,13 @@ def js_rate(self, url_split, post_string, is_json):
     return bytes(json.dumps({'rate': rate}), 'UTF-8')
 
 
-def js_index(self, url_split, post_string, is_json):
+def js_index(self, url_split, post_string, is_json) -> bytes:
-    return bytes(json.dumps(self.server.swap_client.getSummary()), 'UTF-8')
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+    return bytes(json.dumps(swap_client.getSummary()), 'UTF-8')
 
 
-def js_generatenotification(self, url_split, post_string, is_json):
+def js_generatenotification(self, url_split, post_string, is_json) -> bytes:
     swap_client = self.server.swap_client
 
     if not swap_client.debug:
@@ -407,42 +510,243 @@ def js_generatenotification(self, url_split, post_string, is_json):
     elif r == 2:
         swap_client.notify(NT.BID_ACCEPTED, {'bid_id': random.randbytes(28).hex()})
     elif r == 3:
-        swap_client.notify(NT.BID_RECEIVED, {'type': 'xmr', 'bid_id': random.randbytes(28).hex(), 'offer_id': random.randbytes(28).hex()})
+        swap_client.notify(NT.BID_RECEIVED, {'type': 'ads', 'bid_id': random.randbytes(28).hex(), 'offer_id': random.randbytes(28).hex()})
 
     return bytes(json.dumps({'type': r}), 'UTF-8')
 
 
-def js_notifications(self, url_split, post_string, is_json):
+def js_notifications(self, url_split, post_string, is_json) -> bytes:
     swap_client = self.server.swap_client
-    swap_client.getNotifications()
+    swap_client.checkSystemStatus()
 
     return bytes(json.dumps(swap_client.getNotifications()), 'UTF-8')
 
 
-def js_vacuumdb(self, url_split, post_string, is_json):
+def js_identities(self, url_split, post_string: str, is_json: bool) -> bytes:
     swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+
+    filters = {
+        'page_no': 1,
+        'limit': PAGE_LIMIT,
+        'sort_by': 'created_at',
+        'sort_dir': 'desc',
+    }
+
+    if len(url_split) > 3:
+        address = url_split[3]
+        filters['address'] = address
+
+    if post_string != '':
+        post_data = getFormData(post_string, is_json)
+
+        if have_data_entry(post_data, 'sort_by'):
+            sort_by = get_data_entry(post_data, 'sort_by')
+            assert (sort_by in ['created_at', 'rate']), 'Invalid sort by'
+            filters['sort_by'] = sort_by
+        if have_data_entry(post_data, 'sort_dir'):
+            sort_dir = get_data_entry(post_data, 'sort_dir')
+            assert (sort_dir in ['asc', 'desc']), 'Invalid sort dir'
+            filters['sort_dir'] = sort_dir
+
+        if have_data_entry(post_data, 'offset'):
+            filters['offset'] = int(get_data_entry(post_data, 'offset'))
+        if have_data_entry(post_data, 'limit'):
+            filters['limit'] = int(get_data_entry(post_data, 'limit'))
+            assert (filters['limit'] > 0 and filters['limit'] <= PAGE_LIMIT), 'Invalid limit'
+
+        set_data = {}
+        if have_data_entry(post_data, 'set_label'):
+            set_data['label'] = get_data_entry(post_data, 'set_label')
+        if have_data_entry(post_data, 'set_automation_override'):
+            set_data['automation_override'] = get_data_entry(post_data, 'set_automation_override')
+        if have_data_entry(post_data, 'set_visibility_override'):
+            set_data['visibility_override'] = get_data_entry(post_data, 'set_visibility_override')
+        if have_data_entry(post_data, 'set_note'):
+            set_data['note'] = get_data_entry(post_data, 'set_note')
+
+        if set_data:
+            ensure('address' in filters, 'Must provide an address to modify data')
+            swap_client.setIdentityData(filters, set_data)
+
+    return bytes(json.dumps(swap_client.listIdentities(filters)), 'UTF-8')
+
+
+def js_automationstrategies(self, url_split, post_string: str, is_json: bool) -> bytes:
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+
+    filters = {
+        'page_no': 1,
+        'limit': PAGE_LIMIT,
+        'sort_by': 'created_at',
+        'sort_dir': 'desc',
+    }
+
+    if post_string != '':
+        post_data = getFormData(post_string, is_json)
+
+        if have_data_entry(post_data, 'sort_by'):
+            sort_by = get_data_entry(post_data, 'sort_by')
+            assert (sort_by in ['created_at', 'rate']), 'Invalid sort by'
+            filters['sort_by'] = sort_by
+        if have_data_entry(post_data, 'sort_dir'):
+            sort_dir = get_data_entry(post_data, 'sort_dir')
+            assert (sort_dir in ['asc', 'desc']), 'Invalid sort dir'
+            filters['sort_dir'] = sort_dir
+
+        if have_data_entry(post_data, 'offset'):
+            filters['offset'] = int(get_data_entry(post_data, 'offset'))
+        if have_data_entry(post_data, 'limit'):
+            filters['limit'] = int(get_data_entry(post_data, 'limit'))
+            assert (filters['limit'] > 0 and filters['limit'] <= PAGE_LIMIT), 'Invalid limit'
+
+    if len(url_split) > 3:
+        strat_id = int(url_split[3])
+        strat_data = swap_client.getAutomationStrategy(strat_id)
+        rv = {
+            'record_id': strat_data.record_id,
+            'label': strat_data.label,
+            'type_ind': strat_data.type_ind,
+            'only_known_identities': strat_data.only_known_identities,
+            'num_concurrent': strat_data.num_concurrent,
+            'data': json.loads(strat_data.data.decode('utf-8')),
+            'note': '' if strat_data.note is None else strat_data.note,
+        }
+        return bytes(json.dumps(rv), 'UTF-8')
+
+    rv = []
+    strats = swap_client.listAutomationStrategies(filters)
+    for row in strats:
+        rv.append((row[0], row[1], row[2]))
+    return bytes(json.dumps(rv), 'UTF-8')
+
+
+def js_vacuumdb(self, url_split, post_string, is_json) -> bytes:
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
     swap_client.vacuumDB()
 
     return bytes(json.dumps({'completed': True}), 'UTF-8')
 
 
+def js_getcoinseed(self, url_split, post_string, is_json) -> bytes:
+    swap_client = self.server.swap_client
+    swap_client.checkSystemStatus()
+    post_data = getFormData(post_string, is_json)
+
+    coin = getCoinType(get_data_entry(post_data, 'coin'))
+    if coin in (Coins.PART, Coins.PART_ANON, Coins.PART_BLIND):
+        raise ValueError('Particl wallet seed is set from the Basicswap mnemonic.')
+
+    ci = swap_client.ci(coin)
+    if coin == Coins.XMR:
+        key_view = swap_client.getWalletKey(coin, 1, for_ed25519=True)
+        key_spend = swap_client.getWalletKey(coin, 2, for_ed25519=True)
+        address = ci.getAddressFromKeys(key_view, key_spend)
+        return bytes(json.dumps({'coin': ci.ticker(), 'key_view': ci.encodeKey(key_view), 'key_spend': ci.encodeKey(key_spend), 'address': address}), 'UTF-8')
+
+    seed_key = swap_client.getWalletKey(coin, 1)
+    if coin == Coins.DASH:
+        return bytes(json.dumps({'coin': ci.ticker(), 'seed': seed_key.hex(), 'mnemonic': ci.seedToMnemonic(seed_key)}), 'UTF-8')
+    seed_id = ci.getSeedHash(seed_key)
+    return bytes(json.dumps({'coin': ci.ticker(), 'seed': seed_key.hex(), 'seed_id': seed_id.hex()}), 'UTF-8')
+
+
+def js_setpassword(self, url_split, post_string, is_json) -> bytes:
+    # Set or change wallet passwords
+    # Only works with currently enabled coins
+    # Will fail if any coin does not unlock on the old password
+    swap_client = self.server.swap_client
+    post_data = getFormData(post_string, is_json)
+
+    old_password = get_data_entry(post_data, 'oldpassword')
+    new_password = get_data_entry(post_data, 'newpassword')
+
+    if have_data_entry(post_data, 'coin'):
+        # Set password for one coin
+        coin = getCoinType(get_data_entry(post_data, 'coin'))
+        if coin in (Coins.PART_ANON, Coins.PART_BLIND, Coins.LTC_MWEB):
+            raise ValueError('Invalid coin.')
+        swap_client.changeWalletPasswords(old_password, new_password, coin)
+        return bytes(json.dumps({'success': True}), 'UTF-8')
+
+    # Set password for all coins
+    swap_client.changeWalletPasswords(old_password, new_password)
+    return bytes(json.dumps({'success': True}), 'UTF-8')
+
+
+def js_unlock(self, url_split, post_string, is_json) -> bytes:
+    swap_client = self.server.swap_client
+    post_data = getFormData(post_string, is_json)
+
+    password = get_data_entry(post_data, 'password')
+
+    if have_data_entry(post_data, 'coin'):
+        coin = getCoinType(str(get_data_entry(post_data, 'coin')))
+        if coin in (Coins.PART_ANON, Coins.PART_BLIND):
+            raise ValueError('Invalid coin.')
+        swap_client.unlockWallets(password, coin)
+        return bytes(json.dumps({'success': True}), 'UTF-8')
+
+    swap_client.unlockWallets(password)
+    return bytes(json.dumps({'success': True}), 'UTF-8')
+
+
+def js_lock(self, url_split, post_string, is_json) -> bytes:
+    swap_client = self.server.swap_client
+    post_data = {} if post_string == '' else getFormData(post_string, is_json)
+
+    if have_data_entry(post_data, 'coin'):
+        coin = getCoinType(get_data_entry(post_data, 'coin'))
+        if coin in (Coins.PART_ANON, Coins.PART_BLIND):
+            raise ValueError('Invalid coin.')
+        swap_client.lockWallets(coin)
+        return bytes(json.dumps({'success': True}), 'UTF-8')
+
+    swap_client.lockWallets()
+    return bytes(json.dumps({'success': True}), 'UTF-8')
+
+
+def js_404(self, url_split, post_string, is_json) -> bytes:
+    return bytes(json.dumps({'Error': 'path unknown'}), 'UTF-8')
+
+
+def js_help(self, url_split, post_string, is_json) -> bytes:
+    # TODO: Add details and examples
+    commands = []
+    for k in pages:
+        commands.append(k)
+    return bytes(json.dumps({'commands': commands}), 'UTF-8')
+
+
+pages = {
+    'coins': js_coins,
+    'wallets': js_wallets,
+    'offers': js_offers,
+    'sentoffers': js_sentoffers,
+    'bids': js_bids,
+    'sentbids': js_sentbids,
+    'network': js_network,
+    'revokeoffer': js_revokeoffer,
+    'smsgaddresses': js_smsgaddresses,
+    'rate': js_rate,
+    'rates': js_rates,
+    'rateslist': js_rates_list,
+    'generatenotification': js_generatenotification,
+    'notifications': js_notifications,
+    'identities': js_identities,
+    'automationstrategies': js_automationstrategies,
+    'vacuumdb': js_vacuumdb,
+    'getcoinseed': js_getcoinseed,
+    'setpassword': js_setpassword,
+    'unlock': js_unlock,
+    'lock': js_lock,
+    'help': js_help,
+}
+
+
 def js_url_to_function(url_split):
     if len(url_split) > 2:
-        return {
+        return pages.get(url_split[2], js_404)
-            'coins': js_coins,
-            'wallets': js_wallets,
-            'offers': js_offers,
-            'sentoffers': js_sentoffers,
-            'bids': js_bids,
-            'sentbids': js_sentbids,
-            'network': js_network,
-            'revokeoffer': js_revokeoffer,
-            'smsgaddresses': js_smsgaddresses,
-            'rate': js_rate,
-            'rates': js_rates,
-            'rateslist': js_rates_list,
-            'generatenotification': js_generatenotification,
-            'notifications': js_notifications,
-            'vacuumdb': js_vacuumdb,
-        }.get(url_split[2], js_index)
     return js_index

basicswap/messages.proto

@@ -33,6 +33,8 @@ message OfferMessage {
     uint32 protocol_version = 16;
     bool amount_negotiable = 17;
     bool rate_negotiable = 18;
+
+    bytes proof_utxos = 19;          /* 32 byte txid 2 byte vout, repeated */
 }
 
 /* Step 2, buyer -> seller */
@@ -40,8 +42,21 @@ message BidMessage {
     bytes offer_msg_id = 1;
     uint64 time_valid = 2;          /* seconds bid is valid for */
     uint64 amount = 3;              /* amount of amount_from bid is for */
+    uint64 rate = 4;
+    bytes pkhash_buyer = 5;         /* buyer's address to receive amount_from */
+    string proof_address = 6;
+    string proof_signature = 7;
 
-    /* optional */
+    uint32 protocol_version = 8;
+
+    bytes proof_utxos = 9;          /* 32 byte txid 2 byte vout, repeated */
+}
+
+/* For tests */
+message BidMessage_v1Deprecated {
+    bytes offer_msg_id = 1;
+    uint64 time_valid = 2;          /* seconds bid is valid for */
+    uint64 amount = 3;              /* amount of amount_from bid is for */
     uint64 rate = 4;
     bytes pkhash_buyer = 5;         /* buyer's address to receive amount_from */
     string proof_address = 6;
@@ -50,6 +65,8 @@ message BidMessage {
     uint32 protocol_version = 8;
 }
 
+
+
 /* Step 3, seller -> buyer */
 message BidAcceptMessage {
     bytes bid_msg_id = 1;
@@ -131,3 +148,24 @@ message XmrBidLockReleaseMessage {
 
     bytes al_lock_spend_tx_esig = 2;
 }
+
+message ADSBidIntentMessage {
+    /* L -> F Sent from bidder, construct a reverse bid */
+    bytes offer_msg_id = 1;
+    uint64 time_valid = 2;          /* seconds bid is valid for */
+    uint64 amount_from = 3;         /* amount of offer.coin_from bid is for */
+    uint64 amount_to = 4;           /* amount of offer.coin_to bid is for, equivalent to bid.amount */
+    uint64 rate = 5;                /* amount of offer.coin_from bid is for */
+
+    uint32 protocol_version = 6;
+}
+
+message ADSBidIntentAcceptMessage {
+    /* F -> L Sent from offerer, construct a reverse bid */
+    bytes bid_msg_id = 1;
+
+    bytes pkaf = 2;
+    bytes kbvf = 3;
+    bytes kbsf_dleag = 4;
+    bytes dest_af = 5;
+}

basicswap/messages_pb2.py

@@ -2,10 +2,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: messages.proto
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,35 +13,41 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0emessages.proto\x12\tbasicswap\"\xa6\x04\n\x0cOfferMessage\x12\x11\n\tcoin_from\x18\x01 \x01(\r\x12\x0f\n\x07\x63oin_to\x18\x02 \x01(\r\x12\x13\n\x0b\x61mount_from\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x16\n\x0emin_bid_amount\x18\x05 \x01(\x04\x12\x12\n\ntime_valid\x18\x06 \x01(\x04\x12\x33\n\tlock_type\x18\x07 \x01(\x0e\x32 .basicswap.OfferMessage.LockType\x12\x12\n\nlock_value\x18\x08 \x01(\r\x12\x11\n\tswap_type\x18\t \x01(\r\x12\x15\n\rproof_address\x18\n \x01(\t\x12\x17\n\x0fproof_signature\x18\x0b \x01(\t\x12\x15\n\rpkhash_seller\x18\x0c \x01(\x0c\x12\x13\n\x0bsecret_hash\x18\r \x01(\x0c\x12\x15\n\rfee_rate_from\x18\x0e \x01(\x04\x12\x13\n\x0b\x66\x65\x65_rate_to\x18\x0f \x01(\x04\x12\x18\n\x10protocol_version\x18\x10 \x01(\r\x12\x19\n\x11\x61mount_negotiable\x18\x11 \x01(\x08\x12\x17\n\x0frate_negotiable\x18\x12 \x01(\x08\"q\n\x08LockType\x12\x0b\n\x07NOT_SET\x10\x00\x12\x18\n\x14SEQUENCE_LOCK_BLOCKS\x10\x01\x12\x16\n\x12SEQUENCE_LOCK_TIME\x10\x02\x12\x13\n\x0f\x41\x42S_LOCK_BLOCKS\x10\x03\x12\x11\n\rABS_LOCK_TIME\x10\x04\"\xb4\x01\n\nBidMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x14\n\x0cpkhash_buyer\x18\x05 \x01(\x0c\x12\x15\n\rproof_address\x18\x06 \x01(\t\x12\x17\n\x0fproof_signature\x18\x07 \x01(\t\x12\x18\n\x10protocol_version\x18\x08 \x01(\r\"V\n\x10\x42idAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x15\n\rinitiate_txid\x18\x02 \x01(\x0c\x12\x17\n\x0f\x63ontract_script\x18\x03 \x01(\x0c\"=\n\x12OfferRevokeMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\";\n\x10\x42idRejectMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x13\n\x0breject_code\x18\x02 \x01(\r\"\xb2\x01\n\rXmrBidMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x0c\n\x04pkaf\x18\x05 \x01(\x0c\x12\x0c\n\x04kbvf\x18\x06 \x01(\x0c\x12\x12\n\nkbsf_dleag\x18\x07 \x01(\x0c\x12\x0f\n\x07\x64\x65st_af\x18\x08 \x01(\x0c\x12\x18\n\x10protocol_version\x18\t \x01(\r\"T\n\x0fXmrSplitMessage\x12\x0e\n\x06msg_id\x18\x01 \x01(\x0c\x12\x10\n\x08msg_type\x18\x02 \x01(\r\x12\x10\n\x08sequence\x18\x03 \x01(\r\x12\r\n\x05\x64leag\x18\x04 \x01(\x0c\"\x80\x02\n\x13XmrBidAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x0c\n\x04pkal\x18\x03 \x01(\x0c\x12\x0c\n\x04kbvl\x18\x04 \x01(\x0c\x12\x12\n\nkbsl_dleag\x18\x05 \x01(\x0c\x12\x11\n\ta_lock_tx\x18\x06 \x01(\x0c\x12\x18\n\x10\x61_lock_tx_script\x18\x07 \x01(\x0c\x12\x18\n\x10\x61_lock_refund_tx\x18\x08 \x01(\x0c\x12\x1f\n\x17\x61_lock_refund_tx_script\x18\t \x01(\x0c\x12\x1e\n\x16\x61_lock_refund_spend_tx\x18\n \x01(\x0c\x12\x1d\n\x15\x61l_lock_refund_tx_sig\x18\x0b \x01(\x0c\"r\n\x17XmrBidLockTxSigsMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12$\n\x1c\x61\x66_lock_refund_spend_tx_esig\x18\x02 \x01(\x0c\x12\x1d\n\x15\x61\x66_lock_refund_tx_sig\x18\x03 \x01(\x0c\"X\n\x18XmrBidLockSpendTxMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x17\n\x0f\x61_lock_spend_tx\x18\x02 \x01(\x0c\x12\x0f\n\x07kal_sig\x18\x03 \x01(\x0c\"M\n\x18XmrBidLockReleaseMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x1d\n\x15\x61l_lock_spend_tx_esig\x18\x02 \x01(\x0c\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0emessages.proto\x12\tbasicswap\"\xa6\x04\n\x0cOfferMessage\x12\x11\n\tcoin_from\x18\x01 \x01(\r\x12\x0f\n\x07\x63oin_to\x18\x02 \x01(\r\x12\x13\n\x0b\x61mount_from\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x16\n\x0emin_bid_amount\x18\x05 \x01(\x04\x12\x12\n\ntime_valid\x18\x06 \x01(\x04\x12\x33\n\tlock_type\x18\x07 \x01(\x0e\x32 .basicswap.OfferMessage.LockType\x12\x12\n\nlock_value\x18\x08 \x01(\r\x12\x11\n\tswap_type\x18\t \x01(\r\x12\x15\n\rproof_address\x18\n \x01(\t\x12\x17\n\x0fproof_signature\x18\x0b \x01(\t\x12\x15\n\rpkhash_seller\x18\x0c \x01(\x0c\x12\x13\n\x0bsecret_hash\x18\r \x01(\x0c\x12\x15\n\rfee_rate_from\x18\x0e \x01(\x04\x12\x13\n\x0b\x66\x65\x65_rate_to\x18\x0f \x01(\x04\x12\x18\n\x10protocol_version\x18\x10 \x01(\r\x12\x19\n\x11\x61mount_negotiable\x18\x11 \x01(\x08\x12\x17\n\x0frate_negotiable\x18\x12 \x01(\x08\"q\n\x08LockType\x12\x0b\n\x07NOT_SET\x10\x00\x12\x18\n\x14SEQUENCE_LOCK_BLOCKS\x10\x01\x12\x16\n\x12SEQUENCE_LOCK_TIME\x10\x02\x12\x13\n\x0f\x41\x42S_LOCK_BLOCKS\x10\x03\x12\x11\n\rABS_LOCK_TIME\x10\x04\"\xc9\x01\n\nBidMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x14\n\x0cpkhash_buyer\x18\x05 \x01(\x0c\x12\x15\n\rproof_address\x18\x06 \x01(\t\x12\x17\n\x0fproof_signature\x18\x07 \x01(\t\x12\x18\n\x10protocol_version\x18\x08 \x01(\r\x12\x13\n\x0bproof_utxos\x18\t \x01(\x0c\"\xc1\x01\n\x17\x42idMessage_v1Deprecated\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x14\n\x0cpkhash_buyer\x18\x05 \x01(\x0c\x12\x15\n\rproof_address\x18\x06 \x01(\t\x12\x17\n\x0fproof_signature\x18\x07 \x01(\t\x12\x18\n\x10protocol_version\x18\x08 \x01(\r\"V\n\x10\x42idAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x15\n\rinitiate_txid\x18\x02 \x01(\x0c\x12\x17\n\x0f\x63ontract_script\x18\x03 \x01(\x0c\"=\n\x12OfferRevokeMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x11\n\tsignature\x18\x02 \x01(\x0c\";\n\x10\x42idRejectMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x13\n\x0breject_code\x18\x02 \x01(\r\"\xb2\x01\n\rXmrBidMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x0e\n\x06\x61mount\x18\x03 \x01(\x04\x12\x0c\n\x04rate\x18\x04 \x01(\x04\x12\x0c\n\x04pkaf\x18\x05 \x01(\x0c\x12\x0c\n\x04kbvf\x18\x06 \x01(\x0c\x12\x12\n\nkbsf_dleag\x18\x07 \x01(\x0c\x12\x0f\n\x07\x64\x65st_af\x18\x08 \x01(\x0c\x12\x18\n\x10protocol_version\x18\t \x01(\r\"T\n\x0fXmrSplitMessage\x12\x0e\n\x06msg_id\x18\x01 \x01(\x0c\x12\x10\n\x08msg_type\x18\x02 \x01(\r\x12\x10\n\x08sequence\x18\x03 \x01(\r\x12\r\n\x05\x64leag\x18\x04 \x01(\x0c\"\x80\x02\n\x13XmrBidAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x0c\n\x04pkal\x18\x03 \x01(\x0c\x12\x0c\n\x04kbvl\x18\x04 \x01(\x0c\x12\x12\n\nkbsl_dleag\x18\x05 \x01(\x0c\x12\x11\n\ta_lock_tx\x18\x06 \x01(\x0c\x12\x18\n\x10\x61_lock_tx_script\x18\x07 \x01(\x0c\x12\x18\n\x10\x61_lock_refund_tx\x18\x08 \x01(\x0c\x12\x1f\n\x17\x61_lock_refund_tx_script\x18\t \x01(\x0c\x12\x1e\n\x16\x61_lock_refund_spend_tx\x18\n \x01(\x0c\x12\x1d\n\x15\x61l_lock_refund_tx_sig\x18\x0b \x01(\x0c\"r\n\x17XmrBidLockTxSigsMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12$\n\x1c\x61\x66_lock_refund_spend_tx_esig\x18\x02 \x01(\x0c\x12\x1d\n\x15\x61\x66_lock_refund_tx_sig\x18\x03 \x01(\x0c\"X\n\x18XmrBidLockSpendTxMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x17\n\x0f\x61_lock_spend_tx\x18\x02 \x01(\x0c\x12\x0f\n\x07kal_sig\x18\x03 \x01(\x0c\"M\n\x18XmrBidLockReleaseMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x1d\n\x15\x61l_lock_spend_tx_esig\x18\x02 \x01(\x0c\"\x8f\x01\n\x13\x41\x44SBidIntentMessage\x12\x14\n\x0coffer_msg_id\x18\x01 \x01(\x0c\x12\x12\n\ntime_valid\x18\x02 \x01(\x04\x12\x13\n\x0b\x61mount_from\x18\x03 \x01(\x04\x12\x11\n\tamount_to\x18\x04 \x01(\x04\x12\x0c\n\x04rate\x18\x05 \x01(\x04\x12\x18\n\x10protocol_version\x18\x06 \x01(\r\"p\n\x19\x41\x44SBidIntentAcceptMessage\x12\x12\n\nbid_msg_id\x18\x01 \x01(\x0c\x12\x0c\n\x04pkaf\x18\x02 \x01(\x0c\x12\x0c\n\x04kbvf\x18\x03 \x01(\x0c\x12\x12\n\nkbsf_dleag\x18\x04 \x01(\x0c\x12\x0f\n\x07\x64\x65st_af\x18\x05 \x01(\x0c\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_globals = globals()
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'messages_pb2', globals())
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'messages_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
   DESCRIPTOR._options = None
-  _OFFERMESSAGE._serialized_start=30
+  _globals['_OFFERMESSAGE']._serialized_start=30
-  _OFFERMESSAGE._serialized_end=580
+  _globals['_OFFERMESSAGE']._serialized_end=580
-  _OFFERMESSAGE_LOCKTYPE._serialized_start=467
+  _globals['_OFFERMESSAGE_LOCKTYPE']._serialized_start=467
-  _OFFERMESSAGE_LOCKTYPE._serialized_end=580
+  _globals['_OFFERMESSAGE_LOCKTYPE']._serialized_end=580
-  _BIDMESSAGE._serialized_start=583
+  _globals['_BIDMESSAGE']._serialized_start=583
-  _BIDMESSAGE._serialized_end=763
+  _globals['_BIDMESSAGE']._serialized_end=784
-  _BIDACCEPTMESSAGE._serialized_start=765
+  _globals['_BIDMESSAGE_V1DEPRECATED']._serialized_start=787
-  _BIDACCEPTMESSAGE._serialized_end=851
+  _globals['_BIDMESSAGE_V1DEPRECATED']._serialized_end=980
-  _OFFERREVOKEMESSAGE._serialized_start=853
+  _globals['_BIDACCEPTMESSAGE']._serialized_start=982
-  _OFFERREVOKEMESSAGE._serialized_end=914
+  _globals['_BIDACCEPTMESSAGE']._serialized_end=1068
-  _BIDREJECTMESSAGE._serialized_start=916
+  _globals['_OFFERREVOKEMESSAGE']._serialized_start=1070
-  _BIDREJECTMESSAGE._serialized_end=975
+  _globals['_OFFERREVOKEMESSAGE']._serialized_end=1131
-  _XMRBIDMESSAGE._serialized_start=978
+  _globals['_BIDREJECTMESSAGE']._serialized_start=1133
-  _XMRBIDMESSAGE._serialized_end=1156
+  _globals['_BIDREJECTMESSAGE']._serialized_end=1192
-  _XMRSPLITMESSAGE._serialized_start=1158
+  _globals['_XMRBIDMESSAGE']._serialized_start=1195
-  _XMRSPLITMESSAGE._serialized_end=1242
+  _globals['_XMRBIDMESSAGE']._serialized_end=1373
-  _XMRBIDACCEPTMESSAGE._serialized_start=1245
+  _globals['_XMRSPLITMESSAGE']._serialized_start=1375
-  _XMRBIDACCEPTMESSAGE._serialized_end=1501
+  _globals['_XMRSPLITMESSAGE']._serialized_end=1459
-  _XMRBIDLOCKTXSIGSMESSAGE._serialized_start=1503
+  _globals['_XMRBIDACCEPTMESSAGE']._serialized_start=1462
-  _XMRBIDLOCKTXSIGSMESSAGE._serialized_end=1617
+  _globals['_XMRBIDACCEPTMESSAGE']._serialized_end=1718
-  _XMRBIDLOCKSPENDTXMESSAGE._serialized_start=1619
+  _globals['_XMRBIDLOCKTXSIGSMESSAGE']._serialized_start=1720
-  _XMRBIDLOCKSPENDTXMESSAGE._serialized_end=1707
+  _globals['_XMRBIDLOCKTXSIGSMESSAGE']._serialized_end=1834
-  _XMRBIDLOCKRELEASEMESSAGE._serialized_start=1709
+  _globals['_XMRBIDLOCKSPENDTXMESSAGE']._serialized_start=1836
-  _XMRBIDLOCKRELEASEMESSAGE._serialized_end=1786
+  _globals['_XMRBIDLOCKSPENDTXMESSAGE']._serialized_end=1924
+  _globals['_XMRBIDLOCKRELEASEMESSAGE']._serialized_start=1926
+  _globals['_XMRBIDLOCKRELEASEMESSAGE']._serialized_end=2003
+  _globals['_ADSBIDINTENTMESSAGE']._serialized_start=2006
+  _globals['_ADSBIDINTENTMESSAGE']._serialized_end=2149
+  _globals['_ADSBIDINTENTACCEPTMESSAGE']._serialized_start=2151
+  _globals['_ADSBIDINTENTACCEPTMESSAGE']._serialized_end=2263
 # @@protoc_insertion_point(module_scope)

basicswap/network.py

@@ -24,7 +24,6 @@ import queue
 import random
 import select
 import socket
-import struct
 import hashlib
 import logging
 import secrets
@@ -41,7 +40,7 @@ from basicswap.contrib.rfc6979 import (
 
 
 START_TOKEN = 0xabcd
-MSG_START_TOKEN = struct.pack('>H', START_TOKEN)
+MSG_START_TOKEN = START_TOKEN.to_bytes(2, 'big')
 
 MSG_MAX_SIZE = 0x200000  # 2MB
 
@@ -83,8 +82,8 @@ class MsgHandshake:
         pass
 
     def encode_aad(self):  # Additional Authenticated Data
-        return struct.pack('>H', NetMessageTypes.HANDSHAKE) + \
+        return int(NetMessageTypes.HANDSHAKE).to_bytes(2, 'big') + \
-            struct.pack('>Q', self._timestamp) + \
+            self._timestamp.to_bytes(8, 'big') + \
             self._ephem_pk
 
     def encode(self):
@@ -92,7 +91,7 @@ class MsgHandshake:
 
     def decode(self, msg_mv):
         o = 2
-        self._timestamp = struct.unpack('>Q', msg_mv[o: o + 8])[0]
+        self._timestamp = int.from_bytes(msg_mv[o: o + 8], 'big')
         o += 8
         self._ephem_pk = bytes(msg_mv[o: o + 33])
         o += 33
@@ -333,7 +332,7 @@ class Network:
 
             ss = k.ecdh(peer._pubkey)
 
-            hashed = hashlib.sha512(ss + struct.pack('>Q', msg._timestamp)).digest()
+            hashed = hashlib.sha512(ss + msg._timestamp.to_bytes(8, 'big')).digest()
             peer._ke = hashed[:32]
             peer._km = hashed[32:]
 
@@ -386,7 +385,7 @@ class Network:
             nk = PrivateKey(self._network_key)
             ss = nk.ecdh(msg._ephem_pk)
 
-            hashed = hashlib.sha512(ss + struct.pack('>Q', msg._timestamp)).digest()
+            hashed = hashlib.sha512(ss + msg._timestamp.to_bytes(8, 'big')).digest()
             peer._ke = hashed[:32]
             peer._km = hashed[32:]
 
@@ -427,7 +426,7 @@ class Network:
         mac = msg_mv[-16:]
         plaintext = cipher.decrypt_and_verify(msg_mv[2: -16], mac)
 
-        ping_nonce = struct.unpack('>I', plaintext[:4])[0]
+        ping_nonce = int.from_bytes(plaintext[:4], 'big')
         # Version is added to a ping following a handshake message
         if len(plaintext) >= 10:
             peer._ready = True
@@ -450,7 +449,7 @@ class Network:
         mac = msg_mv[-16:]
         plaintext = cipher.decrypt_and_verify(msg_mv[2: -16], mac)
 
-        pong_nonce = struct.unpack('>I', plaintext[:4])[0]
+        pong_nonce = int.from_bytes(plaintext[:4], 'big')
 
         if pong_nonce == peer._ping_nonce:
             peer._last_ping_rtt = (time.time_ns() // 1000) - peer._last_ping_at
@@ -462,14 +461,14 @@ class Network:
     def send_ping(self, peer):
         ping_nonce = random.getrandbits(32)
 
-        msg_bytes = struct.pack('>H', NetMessageTypes.PING)
+        msg_bytes = int(NetMessageTypes.PING).to_bytes(2, 'big')
         nonce = peer._sent_nonce[:24]
 
         cipher = ChaCha20_Poly1305.new(key=peer._ke, nonce=nonce)
         cipher.update(msg_bytes)
         cipher.update(nonce)
 
-        payload = struct.pack('>I', ping_nonce)
+        payload = ping_nonce.to_bytes(4, 'big')
         if peer._last_ping_at == 0:
             payload += self._sc._version
         ct, mac = cipher.encrypt_and_digest(payload)
@@ -484,14 +483,14 @@ class Network:
         self.send_msg(peer, msg_bytes)
 
     def send_pong(self, peer, ping_nonce):
-        msg_bytes = struct.pack('>H', NetMessageTypes.PONG)
+        msg_bytes = int(NetMessageTypes.PONG).to_bytes(2, 'big')
         nonce = peer._sent_nonce[:24]
 
         cipher = ChaCha20_Poly1305.new(key=peer._ke, nonce=nonce)
         cipher.update(msg_bytes)
         cipher.update(nonce)
 
-        payload = struct.pack('>I', ping_nonce)
+        payload = ping_nonce.to_bytes(4, 'big')
         ct, mac = cipher.encrypt_and_digest(payload)
         msg_bytes += ct + mac
 
@@ -503,7 +502,7 @@ class Network:
         msg_encoded = msg if isinstance(msg, bytes) else msg.encode()
         len_encoded = len(msg_encoded)
 
-        msg_packed = bytearray(MSG_START_TOKEN) + struct.pack('>I', len_encoded) + msg_encoded
+        msg_packed = bytearray(MSG_START_TOKEN) + len_encoded.to_bytes(4, 'big') + msg_encoded
         peer._socket.sendall(msg_packed)
 
         peer._bytes_sent += len_encoded
@@ -515,7 +514,7 @@ class Network:
         try:
             mv = memoryview(msg_bytes)
             o = 0
-            msg_type = struct.unpack('>H', mv[o: o + 2])[0]
+            msg_type = int.from_bytes(mv[o: o + 2], 'big')
             if msg_type == NetMessageTypes.HANDSHAKE:
                 self.process_handshake(peer, mv)
             elif msg_type == NetMessageTypes.PING:
@@ -548,13 +547,13 @@ class Network:
                         raise ValueError('Invalid start token')
                     o += 2
 
-                    msg_len = struct.unpack('>I', mv[o: o + 4])[0]
+                    msg_len = int.from_bytes(mv[o: o + 4], 'big')
                     o += 4
                     if msg_len < 2 or msg_len > MSG_MAX_SIZE:
                         raise ValueError('Invalid data length')
 
                     # Precheck msg_type
-                    msg_type = struct.unpack('>H', mv[o: o + 2])[0]
+                    msg_type = int.from_bytes(mv[o: o + 2], 'big')
                     # o += 2  # Don't inc offset, msg includes type
                     if not NetMessageTypes.has_value(msg_type):
                         raise ValueError('Invalid msg type')

basicswap/protocols/__init__.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022-2023 tecnovert
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
+from basicswap.script import (
+    OpCodes,
+)
+from basicswap.interface.btc import (
+    find_vout_for_address_from_txobj,
+)
+
+
+class ProtocolInterface:
+    swap_type = None
+
+    def getFundedInitiateTxTemplate(self, ci, amount: int, sub_fee: bool) -> bytes:
+        raise ValueError('base class')
+
+    def getMockScript(self) -> bytearray:
+        return bytearray([
+            OpCodes.OP_RETURN, OpCodes.OP_1])
+
+    def getMockScriptScriptPubkey(self, ci) -> bytearray:
+        script = self.getMockScript()
+        return ci.getScriptDest(script) if ci._use_segwit else ci.get_p2sh_script_pubkey(script)
+
+    def getMockAddrTo(self, ci):
+        script = self.getMockScript()
+        return ci.encodeScriptDest(ci.getScriptDest(script)) if ci._use_segwit else ci.encode_p2sh(script)
+
+    def findMockVout(self, ci, itx_decoded):
+        mock_addr = self.getMockAddrTo(ci)
+        return find_vout_for_address_from_txobj(itx_decoded, mock_addr)

basicswap/protocols/atomic_swap_1.py

@@ -1,20 +1,29 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2022 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
+from basicswap.db import (
+    Concepts,
+)
 from basicswap.util import (
     SerialiseNum,
 )
 from basicswap.script import (
     OpCodes,
 )
+from basicswap.basicswap_util import (
+    SwapTypes,
+    EventLogTypes,
+)
+from . import ProtocolInterface
 
 INITIATE_TX_TIMEOUT = 40 * 60  # TODO: make variable per coin
+ABS_LOCK_TIME_LEEWAY = 10 * 60
 
 
-def buildContractScript(lock_val, secret_hash, pkh_redeem, pkh_refund, op_lock=OpCodes.OP_CHECKSEQUENCEVERIFY):
+def buildContractScript(lock_val: int, secret_hash: bytes, pkh_redeem: bytes, pkh_refund: bytes, op_lock=OpCodes.OP_CHECKSEQUENCEVERIFY) -> bytearray:
     script = bytearray([
         OpCodes.OP_IF,
         OpCodes.OP_SIZE,
@@ -49,7 +58,7 @@ def extractScriptSecretHash(script):
     return script[7:39]
 
 
-def redeemITx(self, bid_id, session):
+def redeemITx(self, bid_id: bytes, session):
     bid, offer = self.getBidAndOffer(bid_id, session)
     ci_from = self.ci(offer.coin_from)
 
@@ -58,3 +67,34 @@ def redeemITx(self, bid_id, session):
 
     bid.initiate_tx.spend_txid = bytes.fromhex(txid)
     self.log.debug('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, '', session)
+
+
+class AtomicSwapInterface(ProtocolInterface):
+    swap_type = SwapTypes.SELLER_FIRST
+
+    def getFundedInitiateTxTemplate(self, ci, amount: int, sub_fee: bool) -> bytes:
+        addr_to = self.getMockAddrTo(ci)
+        funded_tx = ci.createRawFundedTransaction(addr_to, amount, sub_fee, lock_unspents=False)
+
+        return bytes.fromhex(funded_tx)
+
+    def promoteMockTx(self, ci, mock_tx: bytes, script: bytearray) -> bytearray:
+        mock_txo_script = self.getMockScriptScriptPubkey(ci)
+        real_txo_script = ci.getScriptDest(script) if ci._use_segwit else ci.get_p2sh_script_pubkey(script)
+
+        found: int = 0
+        ctx = ci.loadTx(mock_tx)
+        for txo in ctx.vout:
+            if txo.scriptPubKey == mock_txo_script:
+                txo.scriptPubKey = real_txo_script
+                found += 1
+
+        if found < 1:
+            raise ValueError('Mocked output not found')
+        if found > 1:
+            raise ValueError('Too many mocked outputs found')
+        ctx.nLockTime = 0
+
+        funded_tx = ctx.serialize()
+        return ci.signTxWithWallet(funded_tx)

basicswap/protocols/xmr_swap_1.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -9,13 +9,19 @@ from sqlalchemy.orm import scoped_session
 from basicswap.util import (
     ensure,
 )
+from basicswap.interface import Curves
 from basicswap.chainparams import (
     Coins,
 )
 from basicswap.basicswap_util import (
     KeyTypes,
+    SwapTypes,
     EventLogTypes,
 )
+from . import ProtocolInterface
+from basicswap.contrib.test_framework.script import (
+    CScript, CScriptOp,
+    OP_CHECKMULTISIG)
 
 
 def addLockRefundSigs(self, xmr_swap, ci):
@@ -32,17 +38,17 @@ def addLockRefundSigs(self, xmr_swap, ci):
     xmr_swap.a_lock_refund_tx = signed_tx
 
 
-def recoverNoScriptTxnWithKey(self, bid_id, encoded_key):
+def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key):
     self.log.info('Manually recovering %s', bid_id.hex())
     # Manually recover txn if other key is known
     session = scoped_session(self.session_factory)
     try:
         bid, xmr_swap = self.getXmrBidFromSession(session, bid_id)
         ensure(bid, 'Bid not found: {}.'.format(bid_id.hex()))
-        ensure(xmr_swap, 'XMR swap not found: {}.'.format(bid_id.hex()))
+        ensure(xmr_swap, 'Adaptor-sig swap not found: {}.'.format(bid_id.hex()))
         offer, xmr_offer = self.getXmrOfferFromSession(session, bid.offer_id, sent=False)
         ensure(offer, 'Offer not found: {}.'.format(bid.offer_id.hex()))
-        ensure(xmr_offer, 'XMR offer not found: {}.'.format(bid.offer_id.hex()))
+        ensure(xmr_offer, 'Adaptor-sig offer not found: {}.'.format(bid.offer_id.hex()))
         ci_to = self.ci(offer.coin_to)
 
         for_ed25519 = True if Coins(offer.coin_to) == Coins.XMR else False
@@ -80,7 +86,78 @@ def recoverNoScriptTxnWithKey(self, bid_id, encoded_key):
 
 
 def getChainBSplitKey(swap_client, bid, xmr_swap, offer):
-    ci_to = swap_client.ci(offer.coin_to)
+    reverse_bid: bool = offer.bid_reversed
+    ci_follower = swap_client.ci(offer.coin_from if reverse_bid else offer.coin_to)
 
     key_type = KeyTypes.KBSF if bid.was_sent else KeyTypes.KBSL
-    return ci_to.encodeKey(swap_client.getPathKey(offer.coin_from, offer.coin_to, bid.created_at, xmr_swap.contract_count, key_type, True if offer.coin_to == Coins.XMR else False))
+    return ci_follower.encodeKey(swap_client.getPathKey(offer.coin_from, offer.coin_to, bid.created_at, xmr_swap.contract_count, key_type, True if ci_follower.coin_type() == Coins.XMR else False))
+
+
+def getChainBRemoteSplitKey(swap_client, bid, xmr_swap, offer):
+    reverse_bid: bool = offer.bid_reversed
+    ci_leader = swap_client.ci(offer.coin_to if reverse_bid else offer.coin_from)
+    ci_follower = swap_client.ci(offer.coin_from if reverse_bid else offer.coin_to)
+
+    if bid.was_sent:
+        if xmr_swap.a_lock_refund_spend_tx:
+            af_lock_refund_spend_tx_sig = ci_leader.extractFollowerSig(xmr_swap.a_lock_refund_spend_tx)
+            kbsl = ci_leader.recoverEncKey(xmr_swap.af_lock_refund_spend_tx_esig, af_lock_refund_spend_tx_sig, xmr_swap.pkasl)
+            return ci_follower.encodeKey(kbsl)
+    else:
+        if xmr_swap.a_lock_spend_tx:
+            al_lock_spend_tx_sig = ci_leader.extractLeaderSig(xmr_swap.a_lock_spend_tx)
+            kbsf = ci_leader.recoverEncKey(xmr_swap.al_lock_spend_tx_esig, al_lock_spend_tx_sig, xmr_swap.pkasf)
+            return ci_follower.encodeKey(kbsf)
+    return None
+
+
+def setDLEAG(xmr_swap, ci_to, kbsf: bytes) -> None:
+    if ci_to.curve_type() == Curves.ed25519:
+        xmr_swap.kbsf_dleag = ci_to.proveDLEAG(kbsf)
+        xmr_swap.pkasf = xmr_swap.kbsf_dleag[0: 33]
+    elif ci_to.curve_type() == Curves.secp256k1:
+        for i in range(10):
+            xmr_swap.kbsf_dleag = ci_to.signRecoverable(kbsf, 'proof kbsf owned for swap')
+            pk_recovered: bytes = ci_to.verifySigAndRecover(xmr_swap.kbsf_dleag, 'proof kbsf owned for swap')
+            if pk_recovered == xmr_swap.pkbsf:
+                break
+            # self.log.debug('kbsl recovered pubkey mismatch, retrying.')
+        assert (pk_recovered == xmr_swap.pkbsf)
+        xmr_swap.pkasf = xmr_swap.pkbsf
+    else:
+        raise ValueError('Unknown curve')
+
+
+class XmrSwapInterface(ProtocolInterface):
+    swap_type = SwapTypes.XMR_SWAP
+
+    def genScriptLockTxScript(self, ci, Kal: bytes, Kaf: bytes) -> CScript:
+        Kal_enc = Kal if len(Kal) == 33 else ci.encodePubkey(Kal)
+        Kaf_enc = Kaf if len(Kaf) == 33 else ci.encodePubkey(Kaf)
+
+        return CScript([2, Kal_enc, Kaf_enc, 2, CScriptOp(OP_CHECKMULTISIG)])
+
+    def getFundedInitiateTxTemplate(self, ci, amount: int, sub_fee: bool) -> bytes:
+        addr_to = self.getMockAddrTo(ci)
+        funded_tx = ci.createRawFundedTransaction(addr_to, amount, sub_fee, lock_unspents=False)
+
+        return bytes.fromhex(funded_tx)
+
+    def promoteMockTx(self, ci, mock_tx: bytes, script: bytearray) -> bytearray:
+        mock_txo_script = self.getMockScriptScriptPubkey(ci)
+        real_txo_script = ci.getScriptDest(script)
+
+        found: int = 0
+        ctx = ci.loadTx(mock_tx)
+        for txo in ctx.vout:
+            if txo.scriptPubKey == mock_txo_script:
+                txo.scriptPubKey = real_txo_script
+                found += 1
+
+        if found < 1:
+            raise ValueError('Mocked output not found')
+        if found > 1:
+            raise ValueError('Too many mocked outputs found')
+        ctx.nLockTime = 0
+
+        return ctx.serialize()

basicswap/rpc.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2022 tecnovert
+# Copyright (c) 2020-2023 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -23,10 +23,7 @@ from .util import jsonDecimal
 def waitForRPC(rpc_func, expect_wallet=True, max_tries=7):
     for i in range(max_tries + 1):
         try:
-            if expect_wallet:
+            rpc_func('getwalletinfo' if expect_wallet else 'getblockchaininfo')
-                rpc_func('getwalletinfo')
-            else:
-                rpc_func('getblockchaininfo')
             return
         except Exception as ex:
             if i < max_tries:
@@ -111,7 +108,7 @@ def callrpc(rpc_port, auth, method, params=[], wallet=None, host='127.0.0.1'):
         r = json.loads(v.decode('utf-8'))
     except Exception as ex:
         traceback.print_exc()
-        raise ValueError('RPC server error ' + str(ex))
+        raise ValueError('RPC server error ' + str(ex) + ', method: ' + method)
 
     if 'error' in r and r['error'] is not None:
         raise ValueError('RPC error ' + str(r['error']))
@@ -130,13 +127,15 @@ def openrpc(rpc_port, auth, wallet=None, host='127.0.0.1'):
         raise ValueError('RPC error ' + str(ex))
 
 
-def callrpc_cli(bindir, datadir, chain, cmd, cli_bin='particl-cli'):
+def callrpc_cli(bindir, datadir, chain, cmd, cli_bin='particl-cli', wallet=None):
     cli_bin = os.path.join(bindir, cli_bin)
 
     args = [cli_bin, ]
     if chain != 'mainnet':
         args.append('-' + chain)
     args.append('-datadir=' + datadir)
+    if wallet is not None:
+        args.append('-rpcwallet=' + wallet)
     args += shlex.split(cmd)
 
     p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -163,3 +162,9 @@ def make_rpc_func(port, auth, wallet=None, host='127.0.0.1'):
         nonlocal port, auth, wallet, host
         return callrpc(port, auth, method, params, wallet if wallet_override is None else wallet_override, host)
     return rpc_func
+
+
+def escape_rpcauth(auth_str: str) -> str:
+    username, password = auth_str.split(':', 1)
+    password = urllib.parse.quote(password, safe='')
+    return f'{username}:{password}'

basicswap/rpc_xmr.py

@@ -2,6 +2,7 @@
 
 import os
 import json
+import socks
 import time
 import urllib
 import hashlib
@@ -10,9 +11,32 @@ from xmlrpc.client import (
     Transport,
     SafeTransport,
 )
+from sockshandler import SocksiPyConnection
 from .util import jsonDecimal
 
 
+class SocksTransport(Transport):
+
+    def set_proxy(self, proxy_host, proxy_port):
+        self.proxy_host = proxy_host
+        self.proxy_port = proxy_port
+
+        self.proxy_type = socks.PROXY_TYPE_SOCKS5
+        self.proxy_rdns = True
+        self.proxy_username = None
+        self.proxy_password = None
+
+    def make_connection(self, host):
+        # return an existing connection if possible.  This allows
+        # HTTP/1.1 keep-alive.
+        if self._connection and host == self._connection[0]:
+            return self._connection[1]
+        # create a HTTP connection object from a host descriptor
+        chost, self._extra_headers, x509 = self.get_host_info(host)
+        self._connection = host, SocksiPyConnection(self.proxy_type, self.proxy_host, self.proxy_port, self.proxy_rdns, self.proxy_username, self.proxy_password, chost)
+        return self._connection[1]
+
+
 class JsonrpcDigest():
     # __getattr__ complicates extending ServerProxy
     def __init__(self, uri, transport=None, encoding=None, verbose=False,
@@ -37,12 +61,15 @@ class JsonrpcDigest():
         self.__verbose = verbose
         self.__allow_none = allow_none
 
-        self.__request_id = 1
+        self.__request_id = 0
 
     def close(self):
         if self.__transport is not None:
             self.__transport.close()
 
+    def request_id(self):
+        return self.__request_id
+
     def post_request(self, method, params, timeout=None):
         try:
             connection = self.__transport.make_connection(self.__host)
@@ -66,7 +93,7 @@ class JsonrpcDigest():
             self.__transport.close()
             raise
 
-    def json_request(self, method, params, username='', password='', timeout=None):
+    def json_request(self, request_body, username='', password='', timeout=None):
         try:
             connection = self.__transport.make_connection(self.__host)
             if timeout:
@@ -74,18 +101,11 @@ class JsonrpcDigest():
 
             headers = self.__transport._extra_headers[:]
 
-            request_body = {
-                'method': method,
-                'params': params,
-                'jsonrpc': '2.0',
-                'id': self.__request_id
-            }
-
             connection.putrequest('POST', self.__handler)
             headers.append(('Content-Type', 'application/json'))
             headers.append(('Connection', 'keep-alive'))
             self.__transport.send_headers(connection, headers)
-            self.__transport.send_content(connection, json.dumps(request_body, default=jsonDecimal).encode('utf-8'))
+            self.__transport.send_content(connection, json.dumps(request_body, default=jsonDecimal).encode('utf-8') if request_body else '')
             resp = connection.getresponse()
 
             if resp.status == 401:
@@ -135,18 +155,11 @@ class JsonrpcDigest():
                 headers = self.__transport._extra_headers[:]
                 headers.append(('Authorization', header_value))
 
-                request_body = {
-                    'method': method,
-                    'params': params,
-                    'jsonrpc': '2.0',
-                    'id': self.__request_id
-                }
-
                 connection.putrequest('POST', self.__handler)
                 headers.append(('Content-Type', 'application/json'))
                 headers.append(('Connection', 'keep-alive'))
                 self.__transport.send_headers(connection, headers)
-                self.__transport.send_content(connection, json.dumps(request_body, default=jsonDecimal).encode('utf-8'))
+                self.__transport.send_content(connection, json.dumps(request_body, default=jsonDecimal).encode('utf-8') if request_body else '')
                 resp = connection.getresponse()
 
             self.__request_id += 1
@@ -159,7 +172,7 @@ class JsonrpcDigest():
             raise
 
 
-def callrpc_xmr(rpc_port, auth, method, params=[], rpc_host='127.0.0.1', path='json_rpc', timeout=120):
+def callrpc_xmr(rpc_port, method, params=[], rpc_host='127.0.0.1', path='json_rpc', auth=None, timeout=120, transport=None, tag=''):
     # auth is a tuple: (username, password)
     try:
         if rpc_host.count('://') > 0:
@@ -167,84 +180,79 @@ def callrpc_xmr(rpc_port, auth, method, params=[], rpc_host='127.0.0.1', path='j
         else:
             url = 'http://{}:{}/{}'.format(rpc_host, rpc_port, path)
 
-        x = JsonrpcDigest(url)
+        x = JsonrpcDigest(url, transport=transport)
-        v = x.json_request(method, params, username=auth[0], password=auth[1], timeout=timeout)
+        request_body = {
-        x.close()
+            'method': method,
-        r = json.loads(v.decode('utf-8'))
+            'params': params,
-    except Exception as ex:
+            'jsonrpc': '2.0',
-        raise ValueError('RPC Server Error: {}'.format(str(ex)))
+            'id': x.request_id()
-
+        }
-    if 'error' in r and r['error'] is not None:
+        if auth:
-        raise ValueError('RPC error ' + str(r['error']))
+            v = x.json_request(request_body, username=auth[0], password=auth[1], timeout=timeout)
-
-    return r['result']
-
-
-def callrpc_xmr_na(rpc_port, method, params=[], rpc_host='127.0.0.1', path='json_rpc', timeout=120):
-    try:
-        if rpc_host.count('://') > 0:
-            url = '{}:{}/{}'.format(rpc_host, rpc_port, path)
         else:
-            url = 'http://{}:{}/{}'.format(rpc_host, rpc_port, path)
+            v = x.json_request(request_body, timeout=timeout)
-
-        x = JsonrpcDigest(url)
-        v = x.json_request(method, params, timeout=timeout)
         x.close()
         r = json.loads(v.decode('utf-8'))
     except Exception as ex:
-        raise ValueError('RPC Server Error: {}'.format(str(ex)))
+        raise ValueError('{}RPC Server Error: {}'.format(tag, str(ex)))
 
     if 'error' in r and r['error'] is not None:
-        raise ValueError('RPC error ' + str(r['error']))
+        raise ValueError(tag + 'RPC error ' + str(r['error']))
 
     return r['result']
 
 
-def callrpc_xmr2(rpc_port, method, params=None, rpc_host='127.0.0.1', timeout=120):
+def callrpc_xmr2(rpc_port: int, method: str, params=None, auth=None, rpc_host='127.0.0.1', timeout=120, transport=None, tag=''):
     try:
         if rpc_host.count('://') > 0:
             url = '{}:{}/{}'.format(rpc_host, rpc_port, method)
         else:
             url = 'http://{}:{}/{}'.format(rpc_host, rpc_port, method)
 
-        x = JsonrpcDigest(url)
+        x = JsonrpcDigest(url, transport=transport)
-        v = x.post_request(method, params, timeout=timeout)
+        if auth:
+            v = x.json_request(params, username=auth[0], password=auth[1], timeout=timeout)
+        else:
+            v = x.json_request(params, timeout=timeout)
         x.close()
         r = json.loads(v.decode('utf-8'))
     except Exception as ex:
-        raise ValueError('RPC Server Error: {}'.format(str(ex)))
+        raise ValueError('{}RPC Server Error: {}'.format(tag, str(ex)))
 
     return r
 
 
-def make_xmr_rpc_func(port, host='127.0.0.1'):
+def make_xmr_rpc2_func(port, auth, host='127.0.0.1', proxy_host=None, proxy_port=None, default_timeout=120, tag=''):
-    port = port
-    host = host
-
-    def rpc_func(method, params=None, wallet=None, timeout=120):
-        nonlocal port
-        nonlocal host
-        return callrpc_xmr_na(port, method, params, rpc_host=host, timeout=timeout)
-    return rpc_func
-
-
-def make_xmr_rpc2_func(port, host='127.0.0.1'):
-    port = port
-    host = host
-
-    def rpc_func(method, params=None, wallet=None, timeout=120):
-        nonlocal port
-        nonlocal host
-        return callrpc_xmr2(port, method, params, rpc_host=host, timeout=timeout)
-    return rpc_func
-
-
-def make_xmr_wallet_rpc_func(port, auth, host='127.0.0.1'):
     port = port
     auth = auth
     host = host
+    transport = None
+    default_timeout = default_timeout
+    tag = tag
 
-    def rpc_func(method, params=None, wallet=None, timeout=120):
+    if proxy_host:
-        nonlocal port, auth, host
+        transport = SocksTransport()
-        return callrpc_xmr(port, auth, method, params, rpc_host=host, timeout=timeout)
+        transport.set_proxy(proxy_host, proxy_port)
+
+    def rpc_func(method, params=None, wallet=None, timeout=default_timeout):
+        nonlocal port, auth, host, transport, tag
+        return callrpc_xmr2(port, method, params, auth=auth, rpc_host=host, timeout=timeout, transport=transport, tag=tag)
+    return rpc_func
+
+
+def make_xmr_rpc_func(port, auth, host='127.0.0.1', proxy_host=None, proxy_port=None, default_timeout=120, tag=''):
+    port = port
+    auth = auth
+    host = host
+    transport = None
+    default_timeout = default_timeout
+    tag = tag
+
+    if proxy_host:
+        transport = SocksTransport()
+        transport.set_proxy(proxy_host, proxy_port)
+
+    def rpc_func(method, params=None, wallet=None, timeout=default_timeout):
+        nonlocal port, auth, host, transport, tag
+        return callrpc_xmr(port, method, params, rpc_host=host, auth=auth, timeout=timeout, transport=transport, tag=tag)
     return rpc_func

basicswap/script.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019 tecnovert
+# Copyright (c) 2019-2022 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
@@ -15,6 +15,7 @@ class OpCodes(IntEnum):
     OP_IF = 0x63,
     OP_ELSE = 0x67,
     OP_ENDIF = 0x68,
+    OP_RETURN = 0x6a,
     OP_DROP = 0x75,
     OP_DUP = 0x76,
     OP_SIZE = 0x82,

basicswap/static/css/style.css

@@ -17,18 +17,125 @@
 .floatright
 {
   position: fixed;
-  top: 2em;
+  top:1.25rem;
-  right: 2em;
+  right:1.25rem;
-  margin: 0;
+  z-index: 9999;
-  z-index: 50;
-}
-
-.error
-{
-  border: 1px solid red;
 }
 
 .error_msg
 {
   color:red;
 }
+
+#hide {
+    -moz-animation: cssAnimation 0s ease-in 15s forwards;
+    /* Firefox */
+    -webkit-animation: cssAnimation 0s ease-in 15s forwards;
+    /* Safari and Chrome */
+    -o-animation: cssAnimation 0s ease-in 15s forwards;
+    /* Opera */
+    animation: cssAnimation 0s ease-in 15s forwards;
+    -webkit-animation-fill-mode: forwards;
+    animation-fill-mode: forwards;
+}
+@keyframes cssAnimation {
+    to {
+        width:0;
+        height:0;
+        overflow:hidden;
+    }
+}
+@-webkit-keyframes cssAnimation {
+    to {
+        width:0;
+        height:0;
+        visibility:hidden;
+    }
+}
+
+.custom-select .select {
+    appearance: none;
+    background-image: url('/static/images/other/coin.png');
+    background-position: 10px center;
+    background-repeat: no-repeat;
+    position: relative;
+  }
+
+.custom-select select::-webkit-scrollbar {
+  width: 0;
+}
+
+.custom-select .select option {
+  padding-left: 0;
+  text-indent: 0;
+  background-repeat: no-repeat;
+  background-position: 0 50%;
+}
+
+.custom-select .select option.no-space {
+  padding-left: 0;
+}
+
+.custom-select .select option[data-image] {
+  background-image: url('');
+}
+
+.custom-select .select-icon {
+  position: absolute;
+  top: 50%;
+  left: 10px;
+  transform: translateY(-50%);
+}
+
+.custom-select .select-image {
+  display: none;
+  margin-top: 10px;
+}
+
+.custom-select .select:focus + .select-dropdown .select-image {
+  display: block;
+}
+
+.blurred {
+    filter: blur(4px);
+    pointer-events: none;
+    user-select: none; 
+}
+
+.error-overlay.non-blurred {
+    filter: none;
+    pointer-events: auto;
+    user-select: auto;
+}
+
+/* Disable opacity on disabled form elements in Chrome */
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  select:disabled,
+  input:disabled,
+  textarea:disabled {
+    opacity: 1 !important;
+  }
+}
+
+/* Add this to your existing CSS file */
+.error {
+  border: 1px solid red !important;
+}
+
+.active-container {
+  position: relative;
+  border-radius: 5px;
+}
+
+.active-container::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border: 1px solid rgb(77, 132, 240);
+  border-radius: inherit;
+  pointer-events: none;
+}
+

basicswap/static/images/elements/circle2-violet.svg

@@ -0,0 +1,25 @@
+<svg width="219" height="219" viewBox="0 0 219 219" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_1384_30420" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="219" height="219">
+<circle cx="109.5" cy="109.5" r="107.99" fill="#C4C4C4" stroke="#F8BB54" stroke-width="3.02069"/>
+</mask>
+<g mask="url(#mask0_1384_30420)">
+<path d="M-63.6362 45.9223C-63.6362 45.9223 -12.6466 36.4769 0.509327 3.41839C13.0912 -28.2719 64.9198 -36.79 64.9198 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 61.8112C-63.6362 61.8112 -1.07997 50.9096 15.0337 11.01C30.3968 -27.0802 93.9243 -36.79 93.9243 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 77.7447C-63.6362 77.7447 10.4424 65.3423 29.5139 18.6898C47.7024 -25.9324 122.929 -36.79 122.929 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 93.634C-63.6362 93.634 22.0089 79.7751 44.0382 26.2814C65.0081 -24.7407 151.934 -36.79 151.934 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 109.523C-63.6362 109.523 33.5754 94.2079 58.5626 33.9169C82.3136 -23.549 180.894 -36.79 180.894 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 125.456C-63.6362 125.456 45.0978 108.685 73.0428 41.5524C99.6633 -22.4016 209.898 -36.79 209.898 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 141.346C-63.6362 141.346 56.6643 123.073 87.5672 49.1883C116.969 -21.2099 238.903 -36.79 238.903 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 157.235C-63.6362 157.235 68.2309 137.506 102.047 56.7799C134.275 -20.0182 267.908 -36.79 267.908 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 173.169C-63.6362 173.169 79.753 151.983 116.572 64.4594C151.58 -18.8707 296.868 -36.79 296.868 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 189.056C-63.6362 189.056 91.3198 166.416 131.052 72.0953C168.886 -17.679 325.873 -36.79 325.873 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 204.99C-63.6362 204.99 102.886 180.848 145.576 79.7308C186.192 -16.4873 354.877 -36.79 354.877 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 220.881C-63.6362 220.881 114.409 195.281 160.057 87.3667C203.497 -15.3396 383.881 -36.79 383.881 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 236.768C-63.6362 236.768 125.975 209.714 174.581 94.9579C220.803 -14.1479 412.885 -36.79 412.885 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 252.701C-63.6362 252.701 137.542 224.147 189.105 102.638C238.108 -12.9562 441.847 -36.79 441.847 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 268.592C-63.6362 268.592 149.064 238.579 203.585 110.229C255.414 -11.8087 470.851 -36.79 470.851 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 284.483C-63.6362 284.483 160.631 253.012 218.11 117.865C272.72 -10.617 499.856 -36.79 499.856 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 300.416C-63.6362 300.416 172.197 267.488 232.59 125.501C290.025 -9.42532 528.86 -36.79 528.86 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+<path d="M-63.6362 316.303C-63.6362 316.303 183.719 281.878 247.114 133.136C307.331 -8.27792 557.822 -36.79 557.822 -36.79" stroke="#A855F7" stroke-width="3.39535" stroke-miterlimit="10"/>
+</g>
+</svg>

basicswap/static/images/elements/dots2-red.svg

@@ -0,0 +1,84 @@
+<svg width="199" height="149" viewBox="0 0 199 149" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1384_30010)">
+<path d="M198.91 2.75063C198.91 1.29259 197.728 0.110626 196.27 0.110626C194.812 0.110626 193.63 1.29259 193.63 2.75063C193.63 4.20866 194.812 5.39062 196.27 5.39062C197.728 5.39062 198.91 4.20866 198.91 2.75063Z" fill="#EF5944"/>
+<path d="M198.91 26.6901C198.91 25.232 197.728 24.0501 196.27 24.0501C194.812 24.0501 193.63 25.232 193.63 26.6901C193.63 28.1481 194.812 29.3301 196.27 29.3301C197.728 29.3301 198.91 28.1481 198.91 26.6901Z" fill="#EF5944"/>
+<path d="M198.91 50.6198C198.912 50.0952 198.759 49.5819 198.469 49.1448C198.179 48.7077 197.765 48.3664 197.281 48.1643C196.797 47.9622 196.264 47.9083 195.75 48.0094C195.235 48.1105 194.762 48.3621 194.39 48.7323C194.018 49.1025 193.765 49.5747 193.662 50.089C193.559 50.6033 193.611 51.1367 193.811 51.6215C194.011 52.1063 194.351 52.5207 194.787 52.8124C195.223 53.104 195.736 53.2598 196.26 53.2598C196.961 53.2598 197.634 52.9819 198.131 52.4871C198.627 51.9922 198.908 51.3208 198.91 50.6198V50.6198Z" fill="#EF5944"/>
+<path d="M198.91 74.5502C198.91 74.0261 198.755 73.5137 198.464 73.0779C198.173 72.6421 197.759 72.3025 197.274 72.1019C196.79 71.9014 196.257 71.8489 195.743 71.9512C195.229 72.0534 194.757 72.3058 194.387 72.6764C194.016 73.047 193.764 73.5192 193.661 74.0332C193.559 74.5473 193.612 75.0801 193.812 75.5643C194.013 76.0486 194.352 76.4624 194.788 76.7535C195.224 77.0447 195.736 77.2002 196.26 77.2002C196.608 77.2002 196.953 77.1317 197.274 76.9985C197.596 76.8654 197.888 76.6701 198.134 76.4241C198.38 76.178 198.576 75.8858 198.709 75.5643C198.842 75.2428 198.91 74.8982 198.91 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M198.91 98.4899C198.91 97.0319 197.728 95.8499 196.27 95.8499C194.812 95.8499 193.63 97.0319 193.63 98.4899C193.63 99.9479 194.812 101.13 196.27 101.13C197.728 101.13 198.91 99.9479 198.91 98.4899Z" fill="#EF5944"/>
+<path d="M198.595 121.41C198.041 120.061 196.498 119.418 195.15 119.972C193.801 120.527 193.157 122.069 193.712 123.418C194.266 124.766 195.809 125.41 197.157 124.855C198.506 124.301 199.15 122.758 198.595 121.41Z" fill="#EF5944"/>
+<path d="M193.66 146.35C193.658 146.875 193.812 147.388 194.103 147.826C194.393 148.263 194.807 148.604 195.291 148.806C195.776 149.008 196.31 149.061 196.825 148.959C197.34 148.857 197.813 148.605 198.184 148.234C198.555 147.862 198.808 147.389 198.91 146.874C199.012 146.359 198.958 145.826 198.756 145.341C198.555 144.856 198.214 144.443 197.776 144.152C197.339 143.862 196.825 143.708 196.3 143.71C195.601 143.712 194.931 143.991 194.436 144.486C193.942 144.98 193.663 145.65 193.66 146.35V146.35Z" fill="#EF5944"/>
+<path d="M177.5 2.75063C177.5 1.29259 176.318 0.110626 174.86 0.110626C173.402 0.110626 172.22 1.29259 172.22 2.75063C172.22 4.20866 173.402 5.39062 174.86 5.39062C176.318 5.39062 177.5 4.20866 177.5 2.75063Z" fill="#EF5944"/>
+<path d="M177.5 26.6901C177.5 25.232 176.318 24.0501 174.86 24.0501C173.402 24.0501 172.22 25.232 172.22 26.6901C172.22 28.1481 173.402 29.3301 174.86 29.3301C176.318 29.3301 177.5 28.1481 177.5 26.6901Z" fill="#EF5944"/>
+<path d="M177.5 50.6197C177.502 50.0948 177.348 49.581 177.058 49.1437C176.767 48.7063 176.354 48.3651 175.869 48.1633C175.384 47.9615 174.851 47.9082 174.336 48.0101C173.821 48.112 173.348 48.3646 172.976 48.7358C172.605 49.107 172.353 49.5802 172.251 50.0952C172.149 50.6102 172.202 51.1438 172.404 51.6284C172.606 52.113 172.947 52.5268 173.384 52.8172C173.821 53.1077 174.335 53.2617 174.86 53.2597C175.56 53.2571 176.229 52.978 176.724 52.4835C177.219 51.989 177.498 51.3191 177.5 50.6197V50.6197Z" fill="#EF5944"/>
+<path d="M177.5 74.5502C177.5 74.0256 177.345 73.5129 177.053 73.0769C176.761 72.6409 176.347 72.3012 175.862 72.1009C175.377 71.9007 174.844 71.8488 174.329 71.9519C173.815 72.0549 173.343 72.3083 172.973 72.6799C172.603 73.0515 172.351 73.5247 172.25 74.0394C172.149 74.5541 172.203 75.0872 172.405 75.5713C172.607 76.0553 172.948 76.4684 173.385 76.7584C173.822 77.0484 174.336 77.2022 174.86 77.2002C175.208 77.2002 175.552 77.1316 175.873 76.9983C176.194 76.865 176.485 76.6696 176.73 76.4234C176.976 76.1772 177.17 75.885 177.302 75.5636C177.434 75.2421 177.502 74.8977 177.5 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M177.5 98.4899C177.5 97.0319 176.318 95.8499 174.86 95.8499C173.402 95.8499 172.22 97.0319 172.22 98.4899C172.22 99.9479 173.402 101.13 174.86 101.13C176.318 101.13 177.5 99.9479 177.5 98.4899Z" fill="#EF5944"/>
+<path d="M177.193 121.408C176.639 120.059 175.096 119.416 173.747 119.97C172.399 120.525 171.755 122.067 172.31 123.416C172.864 124.764 174.407 125.408 175.755 124.854C177.104 124.299 177.747 122.756 177.193 121.408Z" fill="#EF5944"/>
+<path d="M177.5 146.35C177.5 145.825 177.345 145.313 177.053 144.877C176.761 144.441 176.347 144.101 175.862 143.901C175.377 143.7 174.844 143.649 174.329 143.752C173.815 143.855 173.343 144.108 172.973 144.48C172.603 144.851 172.351 145.324 172.25 145.839C172.149 146.354 172.203 146.887 172.405 147.371C172.607 147.855 172.948 148.268 173.385 148.558C173.822 148.848 174.336 149.002 174.86 149C175.208 149 175.552 148.931 175.873 148.798C176.194 148.665 176.485 148.469 176.73 148.223C176.976 147.977 177.17 147.685 177.302 147.363C177.434 147.042 177.502 146.697 177.5 146.35Z" fill="#EF5944"/>
+<path d="M156.09 2.75063C156.09 1.29259 154.908 0.110626 153.45 0.110626C151.992 0.110626 150.81 1.29259 150.81 2.75063C150.81 4.20866 151.992 5.39062 153.45 5.39062C154.908 5.39062 156.09 4.20866 156.09 2.75063Z" fill="#EF5944"/>
+<path d="M156.09 26.6901C156.09 25.232 154.908 24.0501 153.45 24.0501C151.992 24.0501 150.81 25.232 150.81 26.6901C150.81 28.1481 151.992 29.3301 153.45 29.3301C154.908 29.3301 156.09 28.1481 156.09 26.6901Z" fill="#EF5944"/>
+<path d="M156.1 50.6198C156.102 50.0952 155.948 49.5819 155.658 49.1448C155.368 48.7077 154.955 48.3664 154.471 48.1643C153.987 47.9622 153.454 47.9083 152.939 48.0094C152.424 48.1105 151.951 48.3621 151.58 48.7323C151.208 49.1025 150.955 49.5747 150.851 50.089C150.748 50.6033 150.8 51.1367 151.001 51.6215C151.201 52.1063 151.541 52.5207 151.977 52.8124C152.413 53.104 152.925 53.2598 153.45 53.2598C154.151 53.2598 154.823 52.9819 155.32 52.4871C155.817 51.9922 156.097 51.3208 156.1 50.6198V50.6198Z" fill="#EF5944"/>
+<path d="M156.1 74.5502C156.1 74.0261 155.944 73.5137 155.653 73.0779C155.362 72.6421 154.948 72.3025 154.464 72.1019C153.98 71.9014 153.447 71.8489 152.933 71.9512C152.419 72.0534 151.947 72.3058 151.576 72.6764C151.205 73.047 150.953 73.5192 150.851 74.0332C150.748 74.5473 150.801 75.0801 151.002 75.5643C151.202 76.0486 151.542 76.4624 151.978 76.7535C152.413 77.0447 152.926 77.2002 153.45 77.2002C153.798 77.2002 154.142 77.1317 154.464 76.9985C154.785 76.8654 155.078 76.6701 155.324 76.4241C155.57 76.178 155.765 75.8858 155.898 75.5643C156.031 75.2428 156.1 74.8982 156.1 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M156.09 98.4899C156.09 97.0319 154.908 95.8499 153.45 95.8499C151.992 95.8499 150.81 97.0319 150.81 98.4899C150.81 99.9479 151.992 101.13 153.45 101.13C154.908 101.13 156.09 99.9479 156.09 98.4899Z" fill="#EF5944"/>
+<path d="M155.792 121.409C155.237 120.06 153.694 119.417 152.346 119.971C150.997 120.526 150.354 122.068 150.908 123.417C151.463 124.765 153.005 125.409 154.354 124.855C155.702 124.3 156.346 122.757 155.792 121.409Z" fill="#EF5944"/>
+<path d="M156.1 146.35C156.1 145.826 155.944 145.313 155.653 144.878C155.362 144.442 154.948 144.102 154.464 143.902C153.98 143.701 153.447 143.649 152.933 143.751C152.419 143.853 151.947 144.105 151.576 144.476C151.205 144.847 150.953 145.319 150.851 145.833C150.748 146.347 150.801 146.88 151.002 147.364C151.202 147.848 151.542 148.262 151.978 148.553C152.413 148.845 152.926 149 153.45 149C154.153 149 154.827 148.721 155.324 148.224C155.821 147.727 156.1 147.053 156.1 146.35V146.35Z" fill="#EF5944"/>
+<path d="M134.69 2.75063C134.69 1.29259 133.508 0.110626 132.05 0.110626C130.592 0.110626 129.41 1.29259 129.41 2.75063C129.41 4.20866 130.592 5.39062 132.05 5.39062C133.508 5.39062 134.69 4.20866 134.69 2.75063Z" fill="#EF5944"/>
+<path d="M134.69 26.6901C134.69 25.232 133.508 24.0501 132.05 24.0501C130.592 24.0501 129.41 25.232 129.41 26.6901C129.41 28.1481 130.592 29.3301 132.05 29.3301C133.508 29.3301 134.69 28.1481 134.69 26.6901Z" fill="#EF5944"/>
+<path d="M134.66 50.6197C134.662 50.0948 134.508 49.581 134.218 49.1437C133.927 48.7063 133.514 48.3651 133.029 48.1633C132.544 47.9615 132.011 47.9082 131.496 48.0101C130.981 48.112 130.508 48.3646 130.137 48.7358C129.765 49.107 129.513 49.5802 129.411 50.0952C129.309 50.6102 129.362 51.1438 129.564 51.6284C129.766 52.113 130.107 52.5268 130.544 52.8172C130.982 53.1077 131.495 53.2617 132.02 53.2597C132.72 53.2571 133.39 52.978 133.884 52.4835C134.379 51.989 134.658 51.3191 134.66 50.6197V50.6197Z" fill="#EF5944"/>
+<path d="M134.66 74.5502C134.66 74.0256 134.505 73.5129 134.213 73.0769C133.921 72.6409 133.507 72.3012 133.022 72.1009C132.537 71.9007 132.004 71.8488 131.49 71.9519C130.975 72.0549 130.503 72.3083 130.133 72.6799C129.763 73.0515 129.511 73.5247 129.41 74.0394C129.309 74.5541 129.363 75.0872 129.565 75.5713C129.767 76.0553 130.108 76.4684 130.545 76.7584C130.982 77.0484 131.496 77.2022 132.02 77.2002C132.368 77.2002 132.712 77.1316 133.033 76.9983C133.354 76.865 133.645 76.6696 133.891 76.4234C134.136 76.1772 134.33 75.885 134.462 75.5636C134.594 75.2421 134.662 74.8977 134.66 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M134.69 98.4899C134.69 97.0319 133.508 95.8499 132.05 95.8499C130.592 95.8499 129.41 97.0319 129.41 98.4899C129.41 99.9479 130.592 101.13 132.05 101.13C133.508 101.13 134.69 99.9479 134.69 98.4899Z" fill="#EF5944"/>
+<path d="M134.389 121.406C133.835 120.057 132.292 119.414 130.944 119.968C129.595 120.523 128.951 122.065 129.506 123.414C130.06 124.762 131.603 125.406 132.951 124.852C134.3 124.297 134.944 122.754 134.389 121.406Z" fill="#EF5944"/>
+<path d="M134.66 146.35C134.66 145.825 134.505 145.313 134.213 144.877C133.921 144.441 133.507 144.101 133.022 143.901C132.537 143.7 132.004 143.649 131.49 143.752C130.975 143.855 130.503 144.108 130.133 144.48C129.763 144.851 129.511 145.324 129.41 145.839C129.309 146.354 129.363 146.887 129.565 147.371C129.767 147.855 130.108 148.268 130.545 148.558C130.982 148.848 131.496 149.002 132.02 149C132.368 149 132.712 148.931 133.033 148.798C133.354 148.665 133.645 148.469 133.891 148.223C134.136 147.977 134.33 147.685 134.462 147.363C134.594 147.042 134.662 146.697 134.66 146.35V146.35Z" fill="#EF5944"/>
+<path d="M113.28 2.75063C113.28 1.29259 112.098 0.110626 110.64 0.110626C109.182 0.110626 108 1.29259 108 2.75063C108 4.20866 109.182 5.39062 110.64 5.39062C112.098 5.39062 113.28 4.20866 113.28 2.75063Z" fill="#EF5944"/>
+<path d="M113.28 26.6901C113.28 25.232 112.098 24.0501 110.64 24.0501C109.182 24.0501 108 25.232 108 26.6901C108 28.1481 109.182 29.3301 110.64 29.3301C112.098 29.3301 113.28 28.1481 113.28 26.6901Z" fill="#EF5944"/>
+<path d="M113.29 50.6198C113.292 50.0952 113.139 49.5819 112.849 49.1448C112.559 48.7077 112.145 48.3664 111.661 48.1643C111.177 47.9622 110.644 47.9083 110.129 48.0094C109.615 48.1105 109.142 48.3621 108.77 48.7323C108.398 49.1025 108.145 49.5747 108.042 50.089C107.939 50.6033 107.991 51.1367 108.191 51.6215C108.391 52.1063 108.731 52.5207 109.167 52.8124C109.603 53.104 110.116 53.2598 110.64 53.2598C111.341 53.2598 112.014 52.9819 112.511 52.4871C113.007 51.9922 113.288 51.3208 113.29 50.6198V50.6198Z" fill="#EF5944"/>
+<path d="M113.29 74.5502C113.29 74.0261 113.135 73.5137 112.844 73.0779C112.552 72.6421 112.139 72.3025 111.654 72.1019C111.17 71.9014 110.637 71.8489 110.123 71.9512C109.609 72.0534 109.137 72.3058 108.766 72.6764C108.396 73.047 108.143 73.5192 108.041 74.0332C107.939 74.5473 107.991 75.0801 108.192 75.5643C108.393 76.0486 108.732 76.4624 109.168 76.7535C109.604 77.0447 110.116 77.2002 110.64 77.2002C110.988 77.2002 111.333 77.1317 111.654 76.9985C111.976 76.8654 112.268 76.6701 112.514 76.4241C112.76 76.178 112.955 75.8858 113.089 75.5643C113.222 75.2428 113.29 74.8982 113.29 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M113.28 98.4899C113.28 97.0319 112.098 95.8499 110.64 95.8499C109.182 95.8499 108 97.0319 108 98.4899C108 99.9479 109.182 101.13 110.64 101.13C112.098 101.13 113.28 99.9479 113.28 98.4899Z" fill="#EF5944"/>
+<path d="M112.977 121.408C112.423 120.059 110.88 119.416 109.531 119.97C108.183 120.525 107.539 122.067 108.094 123.416C108.648 124.764 110.191 125.408 111.539 124.854C112.888 124.299 113.532 122.756 112.977 121.408Z" fill="#EF5944"/>
+<path d="M113.29 146.35C113.29 145.826 113.135 145.313 112.844 144.878C112.552 144.442 112.139 144.102 111.654 143.902C111.17 143.701 110.637 143.649 110.123 143.751C109.609 143.853 109.137 144.105 108.766 144.476C108.396 144.847 108.143 145.319 108.041 145.833C107.939 146.347 107.991 146.88 108.192 147.364C108.393 147.848 108.732 148.262 109.168 148.553C109.604 148.845 110.116 149 110.64 149C111.343 149 112.017 148.721 112.514 148.224C113.011 147.727 113.29 147.053 113.29 146.35V146.35Z" fill="#EF5944"/>
+</g>
+<g clip-path="url(#clip1_1384_30010)">
+<path d="M90.9099 2.75063C90.9099 1.29259 89.7279 0.110626 88.2699 0.110626C86.8119 0.110626 85.6299 1.29259 85.6299 2.75063C85.6299 4.20866 86.8119 5.39062 88.2699 5.39062C89.7279 5.39062 90.9099 4.20866 90.9099 2.75063Z" fill="#EF5944"/>
+<path d="M90.9099 26.6901C90.9099 25.232 89.7279 24.0501 88.2699 24.0501C86.8119 24.0501 85.6299 25.232 85.6299 26.6901C85.6299 28.1481 86.8119 29.3301 88.2699 29.3301C89.7279 29.3301 90.9099 28.1481 90.9099 26.6901Z" fill="#EF5944"/>
+<path d="M90.9104 50.6198C90.9123 50.0952 90.7586 49.5819 90.4686 49.1448C90.1787 48.7077 89.7654 48.3664 89.2814 48.1643C88.7973 47.9622 88.2642 47.9083 87.7495 48.0094C87.2348 48.1105 86.7617 48.3621 86.3901 48.7323C86.0185 49.1025 85.7651 49.5747 85.662 50.089C85.5589 50.6033 85.6108 51.1367 85.8111 51.6215C86.0114 52.1063 86.3511 52.5207 86.7871 52.8124C87.2231 53.104 87.7358 53.2598 88.2603 53.2598C88.9614 53.2598 89.6339 52.9819 90.1306 52.4871C90.6273 51.9922 90.9077 51.3208 90.9104 50.6198V50.6198Z" fill="#EF5944"/>
+<path d="M90.9104 74.5502C90.9104 74.0261 90.7549 73.5137 90.4638 73.0779C90.1726 72.6421 89.7587 72.3025 89.2745 72.1019C88.7903 71.9014 88.2574 71.8489 87.7434 71.9512C87.2293 72.0534 86.7572 72.3058 86.3865 72.6764C86.0159 73.047 85.7635 73.5192 85.6613 74.0332C85.559 74.5473 85.6115 75.0801 85.8121 75.5643C86.0127 76.0486 86.3523 76.4624 86.7881 76.7535C87.2239 77.0447 87.7362 77.2002 88.2603 77.2002C88.6083 77.2002 88.953 77.1317 89.2745 76.9985C89.596 76.8654 89.8881 76.6701 90.1342 76.4241C90.3802 76.178 90.5755 75.8858 90.7087 75.5643C90.8419 75.2428 90.9104 74.8982 90.9104 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M90.9099 98.4899C90.9099 97.0319 89.7279 95.8499 88.2699 95.8499C86.8119 95.8499 85.6299 97.0319 85.6299 98.4899C85.6299 99.9479 86.8119 101.13 88.2699 101.13C89.7279 101.13 90.9099 99.9479 90.9099 98.4899Z" fill="#EF5944"/>
+<path d="M90.5952 121.41C90.0408 120.061 88.4982 119.418 87.1497 119.972C85.8012 120.527 85.1575 122.069 85.7119 123.418C86.2664 124.766 87.809 125.41 89.1575 124.855C90.506 124.301 91.1497 122.758 90.5952 121.41Z" fill="#EF5944"/>
+<path d="M85.6602 146.35C85.6582 146.875 85.8122 147.388 86.1026 147.826C86.393 148.263 86.8068 148.604 87.2915 148.806C87.7761 149.008 88.3097 149.061 88.8247 148.959C89.3397 148.857 89.8128 148.605 90.184 148.234C90.5552 147.862 90.8078 147.389 90.9097 146.874C91.0116 146.359 90.9583 145.826 90.7565 145.341C90.5547 144.856 90.2135 144.443 89.7762 144.152C89.3389 143.862 88.8252 143.708 88.3002 143.71C87.6008 143.712 86.9308 143.991 86.4363 144.486C85.9418 144.98 85.6628 145.65 85.6602 146.35V146.35Z" fill="#EF5944"/>
+<path d="M69.4997 2.75063C69.4997 1.29259 68.3178 0.110626 66.8597 0.110626C65.4017 0.110626 64.2197 1.29259 64.2197 2.75063C64.2197 4.20866 65.4017 5.39062 66.8597 5.39062C68.3178 5.39062 69.4997 4.20866 69.4997 2.75063Z" fill="#EF5944"/>
+<path d="M69.4997 26.6901C69.4997 25.232 68.3178 24.0501 66.8597 24.0501C65.4017 24.0501 64.2197 25.232 64.2197 26.6901C64.2197 28.1481 65.4017 29.3301 66.8597 29.3301C68.3178 29.3301 69.4997 28.1481 69.4997 26.6901Z" fill="#EF5944"/>
+<path d="M69.5002 50.6197C69.5022 50.0948 69.3482 49.581 69.0578 49.1437C68.7673 48.7063 68.3535 48.3651 67.8689 48.1633C67.3843 47.9615 66.8506 47.9082 66.3357 48.0101C65.8207 48.112 65.3475 48.3646 64.9763 48.7358C64.6051 49.107 64.3526 49.5802 64.2506 50.0952C64.1487 50.6102 64.202 51.1438 64.4038 51.6284C64.6056 52.113 64.9469 52.5268 65.3842 52.8172C65.8215 53.1077 66.3352 53.2617 66.8602 53.2597C67.5595 53.2571 68.2295 52.978 68.724 52.4835C69.2185 51.989 69.4976 51.3191 69.5002 50.6197V50.6197Z" fill="#EF5944"/>
+<path d="M69.5002 74.5502C69.5002 74.0256 69.3445 73.5129 69.0529 73.0769C68.7612 72.6409 68.3468 72.3012 67.862 72.1009C67.3772 71.9007 66.8438 71.8488 66.3295 71.9519C65.8152 72.0549 65.343 72.3083 64.9728 72.6799C64.6026 73.0515 64.351 73.5247 64.2499 74.0394C64.1488 74.5541 64.2027 75.0872 64.4048 75.5713C64.6069 76.0553 64.9481 76.4684 65.3852 76.7584C65.8223 77.0484 66.3356 77.2022 66.8602 77.2002C67.2077 77.2002 67.5518 77.1316 67.8728 76.9983C68.1937 76.865 68.4852 76.6696 68.7305 76.4234C68.9758 76.1772 69.17 75.885 69.3021 75.5636C69.4342 75.2421 69.5015 74.8977 69.5002 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M69.4997 98.4899C69.4997 97.0319 68.3178 95.8499 66.8597 95.8499C65.4017 95.8499 64.2197 97.0319 64.2197 98.4899C64.2197 99.9479 65.4017 101.13 66.8597 101.13C68.3178 101.13 69.4997 99.9479 69.4997 98.4899Z" fill="#EF5944"/>
+<path d="M69.193 121.408C68.6385 120.059 67.0959 119.416 65.7474 119.97C64.3989 120.525 63.7551 122.067 64.3096 123.416C64.864 124.764 66.4067 125.408 67.7552 124.854C69.1037 124.299 69.7474 122.756 69.193 121.408Z" fill="#EF5944"/>
+<path d="M69.5002 146.35C69.5002 145.825 69.3445 145.313 69.0529 144.877C68.7612 144.441 68.3468 144.101 67.862 143.901C67.3772 143.7 66.8438 143.649 66.3295 143.752C65.8152 143.855 65.343 144.108 64.9728 144.48C64.6026 144.851 64.351 145.324 64.2499 145.839C64.1488 146.354 64.2027 146.887 64.4048 147.371C64.6069 147.855 64.9481 148.268 65.3852 148.558C65.8223 148.848 66.3356 149.002 66.8602 149C67.2077 149 67.5518 148.931 67.8728 148.798C68.1937 148.665 68.4852 148.469 68.7305 148.223C68.9758 147.977 69.17 147.685 69.3021 147.363C69.4342 147.042 69.5015 146.697 69.5002 146.35Z" fill="#EF5944"/>
+<path d="M48.0896 2.75063C48.0896 1.29259 46.9076 0.110626 45.4496 0.110626C43.9915 0.110626 42.8096 1.29259 42.8096 2.75063C42.8096 4.20866 43.9915 5.39062 45.4496 5.39062C46.9076 5.39062 48.0896 4.20866 48.0896 2.75063Z" fill="#EF5944"/>
+<path d="M48.0896 26.6901C48.0896 25.232 46.9076 24.0501 45.4496 24.0501C43.9915 24.0501 42.8096 25.232 42.8096 26.6901C42.8096 28.1481 43.9915 29.3301 45.4496 29.3301C46.9076 29.3301 48.0896 28.1481 48.0896 26.6901Z" fill="#EF5944"/>
+<path d="M48.0998 50.6198C48.1018 50.0952 47.9481 49.5819 47.6581 49.1448C47.3681 48.7077 46.9549 48.3664 46.4708 48.1643C45.9868 47.9622 45.4537 47.9083 44.939 48.0094C44.4243 48.1105 43.9512 48.3621 43.5795 48.7323C43.2079 49.1025 42.9545 49.5747 42.8515 50.089C42.7484 50.6033 42.8003 51.1367 43.0006 51.6215C43.2008 52.1063 43.5405 52.5207 43.9765 52.8124C44.4125 53.104 44.9252 53.2598 45.4498 53.2598C46.1509 53.2598 46.8234 52.9819 47.3201 52.4871C47.8168 51.9922 48.0972 51.3208 48.0998 50.6198V50.6198Z" fill="#EF5944"/>
+<path d="M48.0998 74.5502C48.0998 74.0261 47.9444 73.5137 47.6532 73.0779C47.362 72.6421 46.9482 72.3025 46.4639 72.1019C45.9797 71.9014 45.4469 71.8489 44.9328 71.9512C44.4188 72.0534 43.9465 72.3058 43.5759 72.6764C43.2053 73.047 42.953 73.5192 42.8507 74.0332C42.7485 74.5473 42.801 75.0801 43.0015 75.5643C43.2021 76.0486 43.5418 76.4624 43.9776 76.7535C44.4133 77.0447 44.9257 77.2002 45.4498 77.2002C45.7978 77.2002 46.1424 77.1317 46.4639 76.9985C46.7855 76.8654 47.0775 76.6701 47.3236 76.4241C47.5697 76.178 47.7649 75.8858 47.8981 75.5643C48.0313 75.2428 48.0998 74.8982 48.0998 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M48.0896 98.4899C48.0896 97.0319 46.9076 95.8499 45.4496 95.8499C43.9915 95.8499 42.8096 97.0319 42.8096 98.4899C42.8096 99.9479 43.9915 101.13 45.4496 101.13C46.9076 101.13 48.0896 99.9479 48.0896 98.4899Z" fill="#EF5944"/>
+<path d="M47.7915 121.409C47.2371 120.06 45.6944 119.417 44.3459 119.971C42.9974 120.526 42.3538 122.068 42.9082 123.417C43.4626 124.765 45.0052 125.409 46.3537 124.855C47.7022 124.3 48.346 122.757 47.7915 121.409Z" fill="#EF5944"/>
+<path d="M48.0998 146.35C48.0998 145.826 47.9444 145.313 47.6532 144.878C47.362 144.442 46.9482 144.102 46.4639 143.902C45.9797 143.701 45.4469 143.649 44.9328 143.751C44.4188 143.853 43.9465 144.105 43.5759 144.476C43.2053 144.847 42.953 145.319 42.8507 145.833C42.7485 146.347 42.801 146.88 43.0015 147.364C43.2021 147.848 43.5418 148.262 43.9776 148.553C44.4133 148.845 44.9257 149 45.4498 149C46.1526 149 46.8266 148.721 47.3236 148.224C47.8206 147.727 48.0998 147.053 48.0998 146.35V146.35Z" fill="#EF5944"/>
+<path d="M26.6902 2.75063C26.6902 1.29259 25.5082 0.110626 24.0502 0.110626C22.5921 0.110626 21.4102 1.29259 21.4102 2.75063C21.4102 4.20866 22.5921 5.39062 24.0502 5.39062C25.5082 5.39062 26.6902 4.20866 26.6902 2.75063Z" fill="#EF5944"/>
+<path d="M26.6902 26.6901C26.6902 25.232 25.5082 24.0501 24.0502 24.0501C22.5921 24.0501 21.4102 25.232 21.4102 26.6901C21.4102 28.1481 22.5921 29.3301 24.0502 29.3301C25.5082 29.3301 26.6902 28.1481 26.6902 26.6901Z" fill="#EF5944"/>
+<path d="M26.6604 50.6197C26.6623 50.0948 26.5083 49.581 26.2179 49.1437C25.9275 48.7063 25.5137 48.3651 25.0291 48.1633C24.5444 47.9615 24.0108 47.9082 23.4958 48.0101C22.9808 48.112 22.5078 48.3646 22.1366 48.7358C21.7653 49.107 21.5127 49.5802 21.4108 50.0952C21.3089 50.6102 21.3622 51.1438 21.564 51.6284C21.7658 52.113 22.107 52.5268 22.5443 52.8172C22.9817 53.1077 23.4954 53.2617 24.0203 53.2597C24.7197 53.2571 25.3897 52.978 25.8842 52.4835C26.3788 51.989 26.6577 51.3191 26.6604 50.6197V50.6197Z" fill="#EF5944"/>
+<path d="M26.6604 74.5502C26.6604 74.0256 26.5047 73.5129 26.213 73.0769C25.9214 72.6409 25.507 72.3012 25.0222 72.1009C24.5374 71.9007 24.004 71.8488 23.4897 71.9519C22.9754 72.0549 22.5032 72.3083 22.133 72.6799C21.7628 73.0515 21.5112 73.5247 21.4101 74.0394C21.3089 74.5541 21.3629 75.0872 21.565 75.5713C21.7671 76.0553 22.1083 76.4684 22.5454 76.7584C22.9825 77.0484 23.4958 77.2022 24.0203 77.2002C24.3679 77.2002 24.712 77.1316 25.033 76.9983C25.3539 76.865 25.6454 76.6696 25.8906 76.4234C26.1359 76.1772 26.3302 75.885 26.4623 75.5636C26.5944 75.2421 26.6617 74.8977 26.6604 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M26.6902 98.4899C26.6902 97.0319 25.5082 95.8499 24.0502 95.8499C22.5921 95.8499 21.4102 97.0319 21.4102 98.4899C21.4102 99.9479 22.5921 101.13 24.0502 101.13C25.5082 101.13 26.6902 99.9479 26.6902 98.4899Z" fill="#EF5944"/>
+<path d="M26.3892 121.406C25.8348 120.057 24.2922 119.414 22.9437 119.968C21.5952 120.523 20.9514 122.065 21.5059 123.414C22.0603 124.762 23.603 125.406 24.9515 124.852C26.3 124.297 26.9437 122.754 26.3892 121.406Z" fill="#EF5944"/>
+<path d="M26.6604 146.35C26.6604 145.825 26.5047 145.313 26.213 144.877C25.9214 144.441 25.507 144.101 25.0222 143.901C24.5374 143.7 24.004 143.649 23.4897 143.752C22.9754 143.855 22.5032 144.108 22.133 144.48C21.7628 144.851 21.5112 145.324 21.4101 145.839C21.3089 146.354 21.3629 146.887 21.565 147.371C21.7671 147.855 22.1083 148.268 22.5454 148.558C22.9825 148.848 23.4958 149.002 24.0203 149C24.3679 149 24.712 148.931 25.033 148.798C25.3539 148.665 25.6454 148.469 25.8906 148.223C26.1359 147.977 26.3302 147.685 26.4623 147.363C26.5944 147.042 26.6617 146.697 26.6604 146.35V146.35Z" fill="#EF5944"/>
+<path d="M5.28 2.75063C5.28 1.29259 4.09803 0.110626 2.64 0.110626C1.18197 0.110626 -1.79131e-07 1.29259 -1.15398e-07 2.75063C-5.16654e-08 4.20866 1.18197 5.39062 2.64 5.39062C4.09803 5.39062 5.28 4.20866 5.28 2.75063Z" fill="#EF5944"/>
+<path d="M5.28 26.6901C5.28 25.232 4.09803 24.0501 2.64 24.0501C1.18197 24.0501 -1.79131e-07 25.232 -1.15398e-07 26.6901C-5.16654e-08 28.1481 1.18197 29.3301 2.64 29.3301C4.09803 29.3301 5.28 28.1481 5.28 26.6901Z" fill="#EF5944"/>
+<path d="M5.29024 50.6198C5.29222 50.0952 5.13851 49.5819 4.84853 49.1448C4.55855 48.7077 4.14532 48.3664 3.66127 48.1643C3.17723 47.9622 2.64412 47.9083 2.12941 48.0094C1.61471 48.1105 1.14159 48.3621 0.769978 48.7323C0.398367 49.1025 0.144953 49.5747 0.0418893 50.089C-0.0611746 50.6033 -0.00927678 51.1367 0.190998 51.6215C0.391273 52.1063 0.730946 52.5207 1.16695 52.8124C1.60295 53.104 2.11567 53.2598 2.64022 53.2598C3.34131 53.2598 4.01383 52.9819 4.51052 52.4871C5.0072 51.9922 5.2876 51.3208 5.29024 50.6198V50.6198Z" fill="#EF5944"/>
+<path d="M5.29023 74.5502C5.29023 74.0261 5.13483 73.5137 4.84364 73.0779C4.55245 72.6421 4.13859 72.3025 3.65437 72.1019C3.17015 71.9014 2.63729 71.8489 2.12324 71.9512C1.60919 72.0534 1.13698 72.3058 0.76637 72.6764C0.39576 73.047 0.143401 73.5192 0.0411499 74.0332C-0.0611009 74.5473 -0.00860443 75.0801 0.191968 75.5643C0.39254 76.0486 0.732191 76.4624 1.16798 76.7535C1.60377 77.0447 2.11609 77.2002 2.64021 77.2002C2.98821 77.2002 3.33286 77.1317 3.65437 76.9985C3.97588 76.8654 4.26798 76.6701 4.51405 76.4241C4.76013 76.178 4.95534 75.8858 5.08851 75.5643C5.22169 75.2428 5.29023 74.8982 5.29023 74.5502V74.5502Z" fill="#EF5944"/>
+<path d="M5.28 98.4899C5.28 97.0319 4.09803 95.8499 2.64 95.8499C1.18197 95.8499 -1.79131e-07 97.0319 -1.15398e-07 98.4899C-5.16654e-08 99.9479 1.18197 101.13 2.64 101.13C4.09803 101.13 5.28 99.9479 5.28 98.4899Z" fill="#EF5944"/>
+<path d="M4.97708 121.408C4.42265 120.059 2.87999 119.416 1.53149 119.97C0.182988 120.525 -0.460681 122.067 0.0937552 123.416C0.648191 124.764 2.19079 125.408 3.53929 124.854C4.88779 124.299 5.53152 122.756 4.97708 121.408Z" fill="#EF5944"/>
+<path d="M5.29023 146.35C5.29023 145.826 5.13483 145.313 4.84364 144.878C4.55245 144.442 4.13859 144.102 3.65437 143.902C3.17015 143.701 2.63729 143.649 2.12324 143.751C1.60919 143.853 1.13698 144.105 0.76637 144.476C0.39576 144.847 0.143401 145.319 0.0411499 145.833C-0.0611009 146.347 -0.00860443 146.88 0.191968 147.364C0.39254 147.848 0.732191 148.262 1.16798 148.553C1.60377 148.845 2.11609 149 2.64021 149C3.34303 149 4.01708 148.721 4.51405 148.224C5.01102 147.727 5.29023 147.053 5.29023 146.35V146.35Z" fill="#EF5944"/>
+</g>
+<defs>
+<clipPath id="clip0_1384_30010">
+<rect width="148.89" height="90.91" fill="white" transform="translate(108 149) rotate(-90)"/>
+</clipPath>
+<clipPath id="clip1_1384_30010">
+<rect width="148.89" height="90.91" fill="white" transform="translate(0 149) rotate(-90)"/>
+</clipPath>
+</defs>
+</svg>

basicswap/static/images/logos/basicswap-logo-dark.svg

@@ -3,44 +3,66 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="121px" height="32px" viewBox="0 0 121 32" style="enable-background:new 0 0 121 32;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#212121;}
+	.st0{fill:#0073FF;stroke:#0073FF;stroke-miterlimit:10;}
-	.st1{fill:#0073FF;stroke:#0073FF;stroke-miterlimit:10;}
+	.st1{fill:#212121;}
 </style>
-<path class="st0" d="M29.6,21.3V8.4h4.5c1.6,0,2.7,0.3,3.5,0.9c0.8,0.6,1.2,1.5,1.2,2.6c0,0.6-0.2,1.2-0.5,1.7s-0.8,0.8-1.3,1
+<path class="st0" d="M5.4,10.6C5.4,9.1,6.6,8,8,8h11.8l-2,2c-0.3,0.3-0.3,0.9,0,1.2s0.9,0.3,1.2,0l3.4-3.4c0.2-0.1,0.3-0.4,0.3-0.7
-	c0.7,0.2,1.2,0.5,1.5,1c0.4,0.5,0.6,1.1,0.6,1.8c0,1.2-0.4,2.2-1.2,2.8c-0.8,0.6-1.9,1-3.4,1h-4.9V21.3z M32.2,15.7v3.5h2.3
-	c0.6,0,1.1-0.1,1.5-0.4s0.5-0.7,0.5-1.2c0-1.2-0.6-1.8-1.8-1.8h-2.5V15.7z M32.2,13.8h2c1.3,0,2-0.6,2-1.6c0-0.6-0.2-1-0.5-1.2
-	c-0.3-0.3-0.9-0.4-1.6-0.4h-1.8v3.2H32.2z M46.5,21.3c-0.1-0.2-0.2-0.5-0.3-0.9c-0.6,0.7-1.4,1-2.4,1c-0.9,0-1.7-0.3-2.3-0.8
-	s-0.9-1.2-0.9-2c0-1,0.4-1.8,1.1-2.3c0.8-0.5,1.8-0.8,3.2-0.8h1.2V15c0-0.4-0.1-0.8-0.3-1.1s-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3
-	s-0.4,0.5-0.4,0.8h-2.5c0-0.6,0.2-1.1,0.5-1.5c0.3-0.5,0.8-0.8,1.4-1.1c0.6-0.3,1.3-0.4,2.1-0.4c1.2,0,2.1,0.3,2.8,0.9
-	c0.7,0.6,1,1.4,1,2.5v4.1c0,0.9,0.1,1.6,0.4,2v0.1L46.5,21.3L46.5,21.3z M44.4,19.5c0.4,0,0.7-0.1,1-0.2c0.3-0.2,0.6-0.4,0.7-0.7V17
-	h-0.9c-1.3,0-1.9,0.4-2,1.3v0.1c0,0.3,0.1,0.6,0.3,0.8C43.7,19.4,44,19.5,44.4,19.5z M55.9,18.6c0-0.3-0.2-0.6-0.5-0.7
-	c-0.3-0.2-0.8-0.3-1.5-0.5c-2.3-0.5-3.4-1.4-3.4-2.9c0-0.8,0.3-1.5,1-2.1s1.6-0.9,2.8-0.9s2.2,0.3,2.9,0.9c0.7,0.6,1.1,1.3,1.1,2.2
-	h-2.5c0-0.4-0.1-0.7-0.4-0.9c-0.2-0.2-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3s-0.4,0.4-0.4,0.7s0.1,0.5,0.4,0.7
-	c0.3,0.2,0.7,0.3,1.4,0.4c0.6,0.1,1.2,0.3,1.6,0.4c1.3,0.5,2,1.3,2,2.6c0,0.9-0.4,1.6-1.1,2.1c-0.7,0.5-1.7,0.8-2.9,0.8
-	c-0.8,0-1.5-0.1-2.1-0.4s-1.1-0.7-1.5-1.2s-0.5-1-0.5-1.6h2.4c0,0.5,0.2,0.8,0.5,1s0.7,0.4,1.2,0.4s0.9-0.1,1.1-0.3
-	C55.8,19.2,55.9,18.9,55.9,18.6z M62.8,21.3h-2.6v-9.5h2.6V21.3z M60.1,9.3c0-0.4,0.1-0.7,0.4-0.9C60.7,8.1,61,8,61.5,8
-	c0.4,0,0.8,0.1,1,0.4c0.3,0.2,0.4,0.6,0.4,0.9c0,0.4-0.1,0.7-0.4,1c-0.3,0.2-0.6,0.4-1,0.4s-0.8-0.1-1-0.4
-	C60.2,10,60.1,9.7,60.1,9.3z M68.9,19.4c0.5,0,0.9-0.1,1.1-0.4c0.3-0.3,0.4-0.6,0.5-1h2.4c0,0.6-0.2,1.2-0.5,1.8
-	c-0.3,0.5-0.8,1-1.4,1.2c-0.6,0.3-1.3,0.4-2,0.4c-1.4,0-2.4-0.4-3.2-1.3c-0.8-0.9-1.2-2.1-1.2-3.6v-0.2c0-1.5,0.4-2.6,1.2-3.5
-	s1.9-1.3,3.2-1.3c1.2,0,2.1,0.3,2.9,1c0.7,0.7,1.1,1.6,1.1,2.7h-2.4c0-0.5-0.2-0.9-0.5-1.2s-0.7-0.5-1.2-0.5c-0.6,0-1,0.2-1.3,0.7
-	c-0.3,0.4-0.4,1.1-0.4,2.1v0.3c0,1,0.1,1.7,0.4,2.1C67.8,19.2,68.3,19.4,68.9,19.4z M79.6,18.6c0-0.3-0.2-0.6-0.5-0.7
-	c-0.3-0.2-0.8-0.3-1.5-0.5c-2.3-0.5-3.4-1.4-3.4-2.9c0-0.8,0.3-1.5,1-2.1s1.6-0.9,2.8-0.9c1.2,0,2.2,0.3,2.9,0.9
-	c0.7,0.6,1.1,1.3,1.1,2.2h-2.5c0-0.4-0.1-0.7-0.4-0.9c-0.2-0.2-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3s-0.4,0.4-0.4,0.7
-	s0.1,0.5,0.4,0.7s0.7,0.3,1.4,0.4c0.6,0.1,1.2,0.3,1.6,0.4c1.3,0.5,2,1.3,2,2.6c0,0.9-0.4,1.6-1.1,2.1s-1.7,0.8-2.9,0.8
-	c-0.8,0-1.5-0.1-2.1-0.4s-1.1-0.7-1.5-1.2s-0.5-1-0.5-1.6h2.4c0,0.5,0.2,0.8,0.5,1s0.7,0.4,1.2,0.4s0.9-0.1,1.1-0.3
-	C79.4,19.2,79.6,18.9,79.6,18.6z M92,17.8l1.2-6.1h2.5l-2.4,9.5h-2.1l-1.8-6l-1.8,6h-2.1L83,11.7h2.5l1.2,6.1l1.7-6.1h1.8L92,17.8z
-	 M102.6,21.3c-0.1-0.2-0.2-0.5-0.3-0.9c-0.6,0.7-1.4,1-2.4,1c-0.9,0-1.7-0.3-2.3-0.8c-0.6-0.5-0.9-1.2-0.9-2c0-1,0.4-1.8,1.1-2.3
-	c0.8-0.5,1.8-0.8,3.2-0.8h1.2V15c0-0.4-0.1-0.8-0.3-1.1c-0.2-0.3-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3s-0.4,0.5-0.4,0.8h-2.5
-	c0-0.6,0.2-1.1,0.5-1.5c0.3-0.5,0.8-0.8,1.4-1.1s1.3-0.4,2.1-0.4c1.2,0,2.1,0.3,2.8,0.9c0.7,0.6,1,1.4,1,2.5v4.1
-	c0,0.9,0.1,1.6,0.4,2v0.1L102.6,21.3L102.6,21.3z M100.5,19.5c0.4,0,0.7-0.1,1-0.2c0.3-0.2,0.6-0.4,0.7-0.7V17h-0.9
-	c-1.3,0-1.9,0.4-2,1.3v0.1c0,0.3,0.1,0.6,0.3,0.8C99.8,19.4,100.1,19.5,100.5,19.5z M115.4,16.6c0,1.5-0.3,2.6-1,3.5
-	s-1.6,1.3-2.7,1.3c-1,0-1.7-0.3-2.3-1v4.5h-2.5V11.7h2.4l0.1,0.9c0.6-0.7,1.4-1.1,2.4-1.1c1.2,0,2.1,0.4,2.7,1.3
-	c0.7,0.9,1,2.1,1,3.6L115.4,16.6L115.4,16.6z M112.8,16.4c0-0.9-0.2-1.6-0.5-2c-0.3-0.5-0.8-0.7-1.4-0.7c-0.8,0-1.3,0.3-1.6,0.9v3.9
-	c0.3,0.6,0.9,0.9,1.7,0.9C112.2,19.4,112.8,18.4,112.8,16.4z"/>
-<path class="st1" d="M5.4,10.6C5.4,9.1,6.6,8,8,8h11.8l-2,2c-0.3,0.3-0.3,0.9,0,1.2s0.9,0.3,1.2,0l3.4-3.4c0.2-0.1,0.3-0.4,0.3-0.7
 	c0-0.2-0.1-0.5-0.3-0.6L19,3c-0.3-0.3-0.9-0.3-1.2,0c-0.3,0.3-0.3,0.9,0,1.2l2,2H8c-2.4,0-4.3,2-4.3,4.4v8.1c0,0.5,0.4,0.9,0.9,0.9
 	s0.9-0.4,0.9-0.9L5.4,10.6L5.4,10.6z"/>
-<path class="st1" d="M18.1,24H6.3l2-2c0.3-0.3,0.3-0.9,0-1.2c-0.3-0.3-0.9-0.3-1.2,0l-3.4,3.4c-0.2,0.1-0.3,0.4-0.3,0.7
+<path class="st0" d="M18.1,24H6.3l2-2c0.3-0.3,0.3-0.9,0-1.2c-0.3-0.3-0.9-0.3-1.2,0l-3.4,3.4c-0.2,0.1-0.3,0.4-0.3,0.7
 	c0,0.2,0.1,0.5,0.3,0.6L7.1,29c0.3,0.3,0.9,0.3,1.2,0s0.3-0.9,0-1.2l-2-2h11.8c2.4,0,4.3-2,4.3-4.4v-8.1c0-0.5-0.4-0.9-0.9-0.9
 	s-0.9,0.4-0.9,0.9v8.1C20.7,22.9,19.5,24,18.1,24z"/>
+<g>
+	<path class="st1" d="M29.6,21.6V10h4.7c0.9,0,1.6,0.1,2.1,0.4s1,0.6,1.3,1.1c0.3,0.4,0.4,1,0.4,1.5c0,0.5-0.1,0.9-0.3,1.2
+		c-0.2,0.3-0.4,0.6-0.7,0.8s-0.7,0.4-1.1,0.5v0.1c0.4,0,0.9,0.1,1.2,0.4c0.4,0.2,0.7,0.6,0.9,1c0.2,0.4,0.4,0.9,0.4,1.5
+		c0,0.6-0.2,1.2-0.5,1.7c-0.3,0.5-0.8,0.9-1.3,1.1c-0.6,0.3-1.3,0.4-2.2,0.4H29.6z M32.1,14.8h1.8c0.3,0,0.6-0.1,0.9-0.2
+		c0.3-0.1,0.5-0.3,0.6-0.5c0.2-0.2,0.2-0.5,0.2-0.8c0-0.4-0.1-0.8-0.4-1C34.9,12.1,34.5,12,34,12h-1.9V14.8z M32.1,19.6h2
+		c0.7,0,1.2-0.1,1.5-0.4s0.5-0.6,0.5-1.1c0-0.3-0.1-0.6-0.2-0.9s-0.4-0.4-0.7-0.6c-0.3-0.1-0.6-0.2-1-0.2h-2.1V19.6z"/>
+	<path class="st1" d="M42.7,21.8c-0.6,0-1.1-0.1-1.5-0.3s-0.8-0.5-1-0.9s-0.4-0.9-0.4-1.4c0-0.5,0.1-0.9,0.3-1.2
+		c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.4,1-0.5s0.8-0.2,1.2-0.2c0.5-0.1,0.9-0.1,1.2-0.2c0.3,0,0.5-0.1,0.7-0.2s0.2-0.2,0.2-0.4v0
+		c0-0.4-0.1-0.6-0.3-0.8c-0.2-0.2-0.5-0.3-1-0.3c-0.4,0-0.8,0.1-1,0.3c-0.3,0.2-0.4,0.4-0.5,0.7l-2.2-0.2c0.1-0.5,0.3-1,0.7-1.4
+		c0.3-0.4,0.8-0.7,1.3-0.9s1.1-0.3,1.8-0.3c0.5,0,1,0.1,1.4,0.2c0.4,0.1,0.8,0.3,1.2,0.5c0.3,0.2,0.6,0.5,0.8,0.9
+		c0.2,0.4,0.3,0.8,0.3,1.3v5.9h-2.3v-1.2h-0.1c-0.1,0.3-0.3,0.5-0.6,0.7c-0.2,0.2-0.5,0.4-0.8,0.5C43.5,21.7,43.1,21.8,42.7,21.8z
+		 M43.4,20.1c0.4,0,0.7-0.1,0.9-0.2c0.3-0.1,0.5-0.3,0.6-0.6c0.2-0.2,0.2-0.5,0.2-0.8v-0.9c-0.1,0-0.2,0.1-0.3,0.1s-0.3,0.1-0.4,0.1
+		c-0.2,0-0.3,0.1-0.5,0.1c-0.2,0-0.3,0-0.4,0.1c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.2-0.5,0.4s-0.2,0.3-0.2,0.6
+		c0,0.3,0.1,0.6,0.4,0.8C42.7,20,43,20.1,43.4,20.1z"/>
+	<path class="st1" d="M56.7,15.4l-2.2,0.1c0-0.2-0.1-0.4-0.2-0.5s-0.3-0.3-0.5-0.4s-0.4-0.1-0.7-0.1c-0.4,0-0.7,0.1-0.9,0.2
+		c-0.3,0.2-0.4,0.4-0.4,0.6c0,0.2,0.1,0.4,0.2,0.5c0.2,0.1,0.5,0.3,0.9,0.3l1.6,0.3c0.8,0.2,1.5,0.5,1.9,0.8
+		c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.5,1.5c-0.3,0.4-0.8,0.8-1.4,1s-1.3,0.4-2,0.4c-1.2,0-2.1-0.2-2.8-0.7
+		c-0.7-0.5-1.1-1.1-1.2-2l2.4-0.1c0.1,0.4,0.2,0.6,0.5,0.8S52.6,20,53,20c0.4,0,0.8-0.1,1-0.2c0.3-0.2,0.4-0.4,0.4-0.6
+		c0-0.2-0.1-0.4-0.3-0.5c-0.2-0.1-0.5-0.3-0.8-0.3L51.8,18c-0.9-0.2-1.5-0.5-1.9-0.9c-0.4-0.4-0.6-1-0.6-1.6c0-0.6,0.2-1,0.5-1.4
+		c0.3-0.4,0.7-0.7,1.3-0.9c0.6-0.2,1.2-0.3,2-0.3c1.1,0,2,0.2,2.6,0.7C56.2,13.9,56.6,14.6,56.7,15.4z"/>
+	<path class="st1" d="M59.7,11.7c-0.4,0-0.7-0.1-0.9-0.4c-0.3-0.2-0.4-0.5-0.4-0.9c0-0.3,0.1-0.6,0.4-0.9c0.3-0.2,0.6-0.4,0.9-0.4
+		c0.4,0,0.7,0.1,0.9,0.4c0.3,0.2,0.4,0.5,0.4,0.9c0,0.3-0.1,0.6-0.4,0.9C60.3,11.6,60,11.7,59.7,11.7z M58.4,21.6v-8.7h2.4v8.7H58.4
+		z"/>
+	<path class="st1" d="M66.7,21.8c-0.9,0-1.7-0.2-2.3-0.6c-0.6-0.4-1.1-0.9-1.5-1.6c-0.3-0.7-0.5-1.5-0.5-2.3c0-0.9,0.2-1.7,0.5-2.4
+		s0.8-1.2,1.5-1.6c0.6-0.4,1.4-0.6,2.3-0.6c0.8,0,1.4,0.1,2,0.4c0.6,0.3,1,0.7,1.4,1.2c0.3,0.5,0.5,1.1,0.6,1.8h-2.3
+		c-0.1-0.4-0.2-0.8-0.5-1.1c-0.3-0.3-0.6-0.4-1.1-0.4c-0.4,0-0.7,0.1-1,0.3c-0.3,0.2-0.5,0.5-0.7,0.9c-0.2,0.4-0.2,0.9-0.2,1.4
+		c0,0.6,0.1,1,0.2,1.4c0.2,0.4,0.4,0.7,0.7,0.9c0.3,0.2,0.6,0.3,1,0.3c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.4-0.3,0.6-0.5
+		c0.1-0.2,0.2-0.5,0.3-0.8h2.3c0,0.7-0.2,1.3-0.5,1.8c-0.3,0.5-0.8,0.9-1.3,1.2C68.2,21.6,67.5,21.8,66.7,21.8z"/>
+	<path class="st1" d="M78.6,13.3c0-0.5-0.2-0.8-0.6-1.1c-0.3-0.3-0.8-0.4-1.4-0.4c-0.4,0-0.7,0.1-1,0.2c-0.3,0.1-0.5,0.3-0.6,0.5
+		c-0.1,0.2-0.2,0.4-0.2,0.7c0,0.2,0,0.4,0.1,0.5s0.2,0.3,0.4,0.4c0.2,0.1,0.4,0.2,0.6,0.3c0.2,0.1,0.5,0.2,0.7,0.2l1,0.2
+		c0.5,0.1,1,0.3,1.4,0.5s0.8,0.4,1.1,0.7s0.6,0.6,0.7,1c0.2,0.4,0.3,0.8,0.3,1.3c0,0.7-0.2,1.3-0.5,1.8c-0.4,0.5-0.9,0.9-1.5,1.2
+		c-0.7,0.3-1.5,0.4-2.4,0.4c-0.9,0-1.8-0.1-2.5-0.4c-0.7-0.3-1.2-0.7-1.6-1.3c-0.4-0.6-0.6-1.3-0.6-2.1h2.4c0,0.4,0.1,0.7,0.3,1
+		c0.2,0.3,0.5,0.5,0.8,0.6s0.7,0.2,1.1,0.2c0.4,0,0.8-0.1,1.1-0.2c0.3-0.1,0.5-0.3,0.7-0.5c0.2-0.2,0.3-0.5,0.3-0.7
+		c0-0.3-0.1-0.5-0.2-0.7c-0.2-0.2-0.4-0.3-0.7-0.5c-0.3-0.1-0.7-0.2-1.1-0.3l-1.3-0.3c-1-0.2-1.8-0.6-2.3-1.1s-0.9-1.2-0.8-2.1
+		c0-0.7,0.2-1.3,0.6-1.8s0.9-0.9,1.6-1.2c0.7-0.3,1.4-0.4,2.3-0.4c0.9,0,1.6,0.1,2.3,0.4c0.6,0.3,1.1,0.7,1.5,1.2
+		c0.4,0.5,0.5,1.1,0.6,1.8H78.6z"/>
+	<path class="st1" d="M84.4,21.6L82,12.9h2.4l1.4,5.9h0.1l1.4-5.9h2.4l1.4,5.8h0.1l1.3-5.8H95l-2.4,8.7h-2.6l-1.5-5.5h-0.1L87,21.6
+		H84.4z"/>
+	<path class="st1" d="M98.8,21.8c-0.6,0-1.1-0.1-1.5-0.3s-0.8-0.5-1-0.9s-0.4-0.9-0.4-1.4c0-0.5,0.1-0.9,0.3-1.2
+		c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.4,1-0.5c0.4-0.1,0.8-0.2,1.2-0.2c0.5-0.1,0.9-0.1,1.2-0.2c0.3,0,0.5-0.1,0.7-0.2
+		c0.1-0.1,0.2-0.2,0.2-0.4v0c0-0.4-0.1-0.6-0.3-0.8c-0.2-0.2-0.5-0.3-1-0.3c-0.4,0-0.8,0.1-1,0.3c-0.3,0.2-0.4,0.4-0.5,0.7l-2.2-0.2
+		c0.1-0.5,0.3-1,0.7-1.4c0.3-0.4,0.8-0.7,1.3-0.9c0.5-0.2,1.1-0.3,1.8-0.3c0.5,0,0.9,0.1,1.4,0.2c0.4,0.1,0.8,0.3,1.2,0.5
+		c0.3,0.2,0.6,0.5,0.8,0.9c0.2,0.4,0.3,0.8,0.3,1.3v5.9h-2.3v-1.2h-0.1c-0.1,0.3-0.3,0.5-0.6,0.7c-0.2,0.2-0.5,0.4-0.8,0.5
+		C99.6,21.7,99.2,21.8,98.8,21.8z M99.5,20.1c0.4,0,0.7-0.1,0.9-0.2s0.5-0.3,0.6-0.6c0.2-0.2,0.2-0.5,0.2-0.8v-0.9
+		c-0.1,0-0.2,0.1-0.3,0.1s-0.3,0.1-0.4,0.1s-0.3,0.1-0.5,0.1c-0.2,0-0.3,0-0.4,0.1c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.2-0.5,0.4
+		c-0.1,0.2-0.2,0.3-0.2,0.6c0,0.3,0.1,0.6,0.4,0.8C98.8,20,99.1,20.1,99.5,20.1z"/>
+	<path class="st1" d="M105.6,24.9v-12h2.4v1.5h0.1c0.1-0.2,0.3-0.5,0.5-0.7c0.2-0.2,0.5-0.4,0.8-0.6c0.3-0.2,0.7-0.2,1.2-0.2
+		c0.6,0,1.2,0.2,1.8,0.5c0.5,0.3,1,0.8,1.3,1.5s0.5,1.5,0.5,2.5c0,1-0.2,1.8-0.5,2.5c-0.3,0.7-0.7,1.2-1.3,1.5
+		c-0.5,0.3-1.1,0.5-1.8,0.5c-0.5,0-0.9-0.1-1.2-0.2c-0.3-0.2-0.6-0.4-0.8-0.6c-0.2-0.2-0.4-0.5-0.5-0.7H108v4.7H105.6z M107.9,17.2
+		c0,0.5,0.1,1,0.2,1.4c0.1,0.4,0.4,0.7,0.6,0.9c0.3,0.2,0.6,0.3,1,0.3c0.4,0,0.7-0.1,1-0.3c0.3-0.2,0.5-0.5,0.6-0.9
+		c0.1-0.4,0.2-0.8,0.2-1.3c0-0.5-0.1-0.9-0.2-1.3c-0.1-0.4-0.3-0.7-0.6-0.9c-0.3-0.2-0.6-0.3-1-0.3c-0.4,0-0.7,0.1-1,0.3
+		c-0.3,0.2-0.5,0.5-0.6,0.9C108,16.3,107.9,16.7,107.9,17.2z"/>
+</g>
 </svg>

basicswap/static/images/logos/basicswap-logo.svg

@@ -1,47 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="121px" height="32px" viewBox="0 0 121 32" style="enable-background:new 0 0 121 32;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#FFFFFF;}
+	.st0{fill:#0073FF;stroke:#0073FF;stroke-miterlimit:10;}
-	.st1{fill:#0073FF;stroke:#0073FF;stroke-miterlimit:10;}
+	.st1{fill:#FFFFFF;}
 </style>
-<path class="st0" d="M29.6,21.3V8.4h4.5c1.6,0,2.7,0.3,3.5,0.9c0.8,0.6,1.2,1.5,1.2,2.6c0,0.6-0.2,1.2-0.5,1.7
+<path class="st0" d="M5.4,10.6C5.4,9.1,6.6,8,8,8h11.8l-2,2c-0.3,0.3-0.3,0.9,0,1.2s0.9,0.3,1.2,0l3.4-3.4c0.2-0.1,0.3-0.4,0.3-0.7
-	c-0.3,0.5-0.8,0.8-1.3,1c0.7,0.2,1.2,0.5,1.5,1c0.4,0.5,0.6,1.1,0.6,1.8c0,1.2-0.4,2.2-1.2,2.8c-0.8,0.6-1.9,1-3.4,1H29.6z
+	c0-0.2-0.1-0.5-0.3-0.6L19,3c-0.3-0.3-0.9-0.3-1.2,0c-0.3,0.3-0.3,0.9,0,1.2l2,2H8c-2.4,0-4.3,2-4.3,4.4v8.1c0,0.5,0.4,0.9,0.9,0.9
-	 M32.2,15.7v3.5h2.3c0.6,0,1.1-0.1,1.5-0.4c0.4-0.3,0.5-0.7,0.5-1.2c0-1.2-0.6-1.8-1.8-1.8H32.2z M32.2,13.8h2c1.3,0,2-0.6,2-1.6
+	s0.9-0.4,0.9-0.9L5.4,10.6L5.4,10.6z"/>
-	c0-0.6-0.2-1-0.5-1.2c-0.3-0.3-0.9-0.4-1.6-0.4h-1.8V13.8z M46.5,21.3c-0.1-0.2-0.2-0.5-0.3-0.9c-0.6,0.7-1.4,1-2.4,1
+<path class="st0" d="M18.1,24H6.3l2-2c0.3-0.3,0.3-0.9,0-1.2c-0.3-0.3-0.9-0.3-1.2,0l-3.4,3.4c-0.2,0.1-0.3,0.4-0.3,0.7
-	c-0.9,0-1.7-0.3-2.3-0.8c-0.6-0.5-0.9-1.2-0.9-2c0-1,0.4-1.8,1.1-2.3c0.8-0.5,1.8-0.8,3.2-0.8h1.2v-0.5c0-0.4-0.1-0.8-0.3-1.1
+	c0,0.2,0.1,0.5,0.3,0.6L7.1,29c0.3,0.3,0.9,0.3,1.2,0s0.3-0.9,0-1.2l-2-2h11.8c2.4,0,4.3-2,4.3-4.4v-8.1c0-0.5-0.4-0.9-0.9-0.9
-	c-0.2-0.3-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3c-0.2,0.2-0.4,0.5-0.4,0.8h-2.5c0-0.6,0.2-1.1,0.5-1.5c0.3-0.5,0.8-0.8,1.4-1.1
+	s-0.9,0.4-0.9,0.9v8.1C20.7,22.9,19.5,24,18.1,24z"/>
-	c0.6-0.3,1.3-0.4,2.1-0.4c1.2,0,2.1,0.3,2.8,0.9c0.7,0.6,1,1.4,1,2.5v4.1c0,0.9,0.1,1.6,0.4,2v0.1H46.5z M44.4,19.5
+<g>
-	c0.4,0,0.7-0.1,1-0.2c0.3-0.2,0.6-0.4,0.7-0.7v-1.6h-0.9c-1.3,0-1.9,0.4-2,1.3l0,0.1c0,0.3,0.1,0.6,0.3,0.8
+	<path class="st1" d="M29.6,21.6V10h4.7c0.9,0,1.6,0.1,2.1,0.4s1,0.6,1.3,1.1c0.3,0.4,0.4,1,0.4,1.5c0,0.5-0.1,0.9-0.3,1.2
-	C43.7,19.4,44,19.5,44.4,19.5z M55.9,18.6c0-0.3-0.2-0.6-0.5-0.7c-0.3-0.2-0.8-0.3-1.5-0.5c-2.3-0.5-3.4-1.4-3.4-2.9
+		c-0.2,0.3-0.4,0.6-0.7,0.8s-0.7,0.4-1.1,0.5v0.1c0.4,0,0.9,0.1,1.2,0.4c0.4,0.2,0.7,0.6,0.9,1c0.2,0.4,0.4,0.9,0.4,1.5
-	c0-0.8,0.3-1.5,1-2.1c0.7-0.6,1.6-0.9,2.8-0.9c1.2,0,2.2,0.3,2.9,0.9c0.7,0.6,1.1,1.3,1.1,2.2h-2.5c0-0.4-0.1-0.7-0.4-0.9
+		c0,0.6-0.2,1.2-0.5,1.7c-0.3,0.5-0.8,0.9-1.3,1.1c-0.6,0.3-1.3,0.4-2.2,0.4H29.6z M32.1,14.8h1.8c0.3,0,0.6-0.1,0.9-0.2
-	c-0.2-0.2-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3c-0.2,0.2-0.4,0.4-0.4,0.7c0,0.3,0.1,0.5,0.4,0.7c0.3,0.2,0.7,0.3,1.4,0.4
+		c0.3-0.1,0.5-0.3,0.6-0.5c0.2-0.2,0.2-0.5,0.2-0.8c0-0.4-0.1-0.8-0.4-1C34.9,12.1,34.5,12,34,12h-1.9V14.8z M32.1,19.6h2
-	c0.6,0.1,1.2,0.3,1.6,0.4c1.3,0.5,2,1.3,2,2.6c0,0.9-0.4,1.6-1.1,2.1c-0.7,0.5-1.7,0.8-2.9,0.8c-0.8,0-1.5-0.1-2.1-0.4
+		c0.7,0,1.2-0.1,1.5-0.4s0.5-0.6,0.5-1.1c0-0.3-0.1-0.6-0.2-0.9s-0.4-0.4-0.7-0.6c-0.3-0.1-0.6-0.2-1-0.2h-2.1V19.6z"/>
-	c-0.6-0.3-1.1-0.7-1.5-1.2c-0.4-0.5-0.5-1-0.5-1.6h2.4c0,0.5,0.2,0.8,0.5,1c0.3,0.2,0.7,0.4,1.2,0.4c0.5,0,0.9-0.1,1.1-0.3
+	<path class="st1" d="M42.7,21.8c-0.6,0-1.1-0.1-1.5-0.3s-0.8-0.5-1-0.9s-0.4-0.9-0.4-1.4c0-0.5,0.1-0.9,0.3-1.2
-	C55.8,19.2,55.9,18.9,55.9,18.6z M62.8,21.3h-2.6v-9.5h2.6V21.3z M60.1,9.3c0-0.4,0.1-0.7,0.4-0.9C60.7,8.1,61,8,61.5,8
+		c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.4,1-0.5s0.8-0.2,1.2-0.2c0.5-0.1,0.9-0.1,1.2-0.2c0.3,0,0.5-0.1,0.7-0.2s0.2-0.2,0.2-0.4v0
-	c0.4,0,0.8,0.1,1,0.4c0.3,0.2,0.4,0.6,0.4,0.9c0,0.4-0.1,0.7-0.4,1c-0.3,0.2-0.6,0.4-1,0.4c-0.4,0-0.8-0.1-1-0.4
+		c0-0.4-0.1-0.6-0.3-0.8c-0.2-0.2-0.5-0.3-1-0.3c-0.4,0-0.8,0.1-1,0.3c-0.3,0.2-0.4,0.4-0.5,0.7l-2.2-0.2c0.1-0.5,0.3-1,0.7-1.4
-	C60.2,10,60.1,9.7,60.1,9.3z M68.9,19.4c0.5,0,0.9-0.1,1.1-0.4c0.3-0.3,0.4-0.6,0.5-1h2.4c0,0.6-0.2,1.2-0.5,1.8
+		c0.3-0.4,0.8-0.7,1.3-0.9s1.1-0.3,1.8-0.3c0.5,0,1,0.1,1.4,0.2c0.4,0.1,0.8,0.3,1.2,0.5c0.3,0.2,0.6,0.5,0.8,0.9
-	c-0.3,0.5-0.8,1-1.4,1.2c-0.6,0.3-1.3,0.4-2,0.4c-1.4,0-2.4-0.4-3.2-1.3c-0.8-0.9-1.2-2.1-1.2-3.6v-0.2c0-1.5,0.4-2.6,1.2-3.5
+		c0.2,0.4,0.3,0.8,0.3,1.3v5.9h-2.3v-1.2h-0.1c-0.1,0.3-0.3,0.5-0.6,0.7c-0.2,0.2-0.5,0.4-0.8,0.5C43.5,21.7,43.1,21.8,42.7,21.8z
-	s1.9-1.3,3.2-1.3c1.2,0,2.1,0.3,2.9,1c0.7,0.7,1.1,1.6,1.1,2.7h-2.4c0-0.5-0.2-0.9-0.5-1.2c-0.3-0.3-0.7-0.5-1.2-0.5
+		 M43.4,20.1c0.4,0,0.7-0.1,0.9-0.2c0.3-0.1,0.5-0.3,0.6-0.6c0.2-0.2,0.2-0.5,0.2-0.8v-0.9c-0.1,0-0.2,0.1-0.3,0.1s-0.3,0.1-0.4,0.1
-	c-0.6,0-1,0.2-1.3,0.7c-0.3,0.4-0.4,1.1-0.4,2.1v0.3c0,1,0.1,1.7,0.4,2.1C67.8,19.2,68.3,19.4,68.9,19.4z M79.6,18.6
+		c-0.2,0-0.3,0.1-0.5,0.1c-0.2,0-0.3,0-0.4,0.1c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.2-0.5,0.4s-0.2,0.3-0.2,0.6
-	c0-0.3-0.2-0.6-0.5-0.7c-0.3-0.2-0.8-0.3-1.5-0.5c-2.3-0.5-3.4-1.4-3.4-2.9c0-0.8,0.3-1.5,1-2.1c0.7-0.6,1.6-0.9,2.8-0.9
+		c0,0.3,0.1,0.6,0.4,0.8C42.7,20,43,20.1,43.4,20.1z"/>
-	c1.2,0,2.2,0.3,2.9,0.9c0.7,0.6,1.1,1.3,1.1,2.2h-2.5c0-0.4-0.1-0.7-0.4-0.9c-0.2-0.2-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3
+	<path class="st1" d="M56.7,15.4l-2.2,0.1c0-0.2-0.1-0.4-0.2-0.5s-0.3-0.3-0.5-0.4s-0.4-0.1-0.7-0.1c-0.4,0-0.7,0.1-0.9,0.2
-	c-0.2,0.2-0.4,0.4-0.4,0.7c0,0.3,0.1,0.5,0.4,0.7c0.3,0.2,0.7,0.3,1.4,0.4c0.6,0.1,1.2,0.3,1.6,0.4c1.3,0.5,2,1.3,2,2.6
+		c-0.3,0.2-0.4,0.4-0.4,0.6c0,0.2,0.1,0.4,0.2,0.5c0.2,0.1,0.5,0.3,0.9,0.3l1.6,0.3c0.8,0.2,1.5,0.5,1.9,0.8
-	c0,0.9-0.4,1.6-1.1,2.1c-0.7,0.5-1.7,0.8-2.9,0.8c-0.8,0-1.5-0.1-2.1-0.4c-0.6-0.3-1.1-0.7-1.5-1.2c-0.4-0.5-0.5-1-0.5-1.6h2.4
+		c0.4,0.4,0.6,0.9,0.6,1.5c0,0.6-0.2,1.1-0.5,1.5c-0.3,0.4-0.8,0.8-1.4,1s-1.3,0.4-2,0.4c-1.2,0-2.1-0.2-2.8-0.7
-	c0,0.5,0.2,0.8,0.5,1c0.3,0.2,0.7,0.4,1.2,0.4c0.5,0,0.9-0.1,1.1-0.3C79.4,19.2,79.6,18.9,79.6,18.6z M92,17.8l1.2-6.1h2.5l-2.4,9.5
+		c-0.7-0.5-1.1-1.1-1.2-2l2.4-0.1c0.1,0.4,0.2,0.6,0.5,0.8S52.6,20,53,20c0.4,0,0.8-0.1,1-0.2c0.3-0.2,0.4-0.4,0.4-0.6
-	h-2.1l-1.8-6l-1.8,6h-2.1L83,11.7h2.5l1.2,6.1l1.7-6.1h1.8L92,17.8z M102.6,21.3c-0.1-0.2-0.2-0.5-0.3-0.9c-0.6,0.7-1.4,1-2.4,1
+		c0-0.2-0.1-0.4-0.3-0.5c-0.2-0.1-0.5-0.3-0.8-0.3L51.8,18c-0.9-0.2-1.5-0.5-1.9-0.9c-0.4-0.4-0.6-1-0.6-1.6c0-0.6,0.2-1,0.5-1.4
-	c-0.9,0-1.7-0.3-2.3-0.8c-0.6-0.5-0.9-1.2-0.9-2c0-1,0.4-1.8,1.1-2.3c0.8-0.5,1.8-0.8,3.2-0.8h1.2v-0.5c0-0.4-0.1-0.8-0.3-1.1
+		c0.3-0.4,0.7-0.7,1.3-0.9c0.6-0.2,1.2-0.3,2-0.3c1.1,0,2,0.2,2.6,0.7C56.2,13.9,56.6,14.6,56.7,15.4z"/>
-	c-0.2-0.3-0.6-0.4-1.1-0.4c-0.4,0-0.8,0.1-1,0.3c-0.2,0.2-0.4,0.5-0.4,0.8h-2.5c0-0.6,0.2-1.1,0.5-1.5c0.3-0.5,0.8-0.8,1.4-1.1
+	<path class="st1" d="M59.7,11.7c-0.4,0-0.7-0.1-0.9-0.4c-0.3-0.2-0.4-0.5-0.4-0.9c0-0.3,0.1-0.6,0.4-0.9c0.3-0.2,0.6-0.4,0.9-0.4
-	c0.6-0.3,1.3-0.4,2.1-0.4c1.2,0,2.1,0.3,2.8,0.9c0.7,0.6,1,1.4,1,2.5v4.1c0,0.9,0.1,1.6,0.4,2v0.1H102.6z M100.5,19.5
+		c0.4,0,0.7,0.1,0.9,0.4c0.3,0.2,0.4,0.5,0.4,0.9c0,0.3-0.1,0.6-0.4,0.9C60.3,11.6,60,11.7,59.7,11.7z M58.4,21.6v-8.7h2.4v8.7H58.4
-	c0.4,0,0.7-0.1,1-0.2c0.3-0.2,0.6-0.4,0.7-0.7v-1.6h-0.9c-1.3,0-1.9,0.4-2,1.3l0,0.1c0,0.3,0.1,0.6,0.3,0.8
+		z"/>
-	C99.8,19.4,100.1,19.5,100.5,19.5z M115.4,16.6c0,1.5-0.3,2.6-1,3.5c-0.7,0.9-1.6,1.3-2.7,1.3c-1,0-1.7-0.3-2.3-1v4.5h-2.5V11.7h2.4
+	<path class="st1" d="M66.7,21.8c-0.9,0-1.7-0.2-2.3-0.6c-0.6-0.4-1.1-0.9-1.5-1.6c-0.3-0.7-0.5-1.5-0.5-2.3c0-0.9,0.2-1.7,0.5-2.4
-	l0.1,0.9c0.6-0.7,1.4-1.1,2.4-1.1c1.2,0,2.1,0.4,2.7,1.3c0.7,0.9,1,2.1,1,3.6V16.6z M112.8,16.4c0-0.9-0.2-1.6-0.5-2
+		s0.8-1.2,1.5-1.6c0.6-0.4,1.4-0.6,2.3-0.6c0.8,0,1.4,0.1,2,0.4c0.6,0.3,1,0.7,1.4,1.2c0.3,0.5,0.5,1.1,0.6,1.8h-2.3
-	c-0.3-0.5-0.8-0.7-1.4-0.7c-0.8,0-1.3,0.3-1.6,0.9v3.9c0.3,0.6,0.9,0.9,1.7,0.9C112.2,19.4,112.8,18.4,112.8,16.4z"/>
+		c-0.1-0.4-0.2-0.8-0.5-1.1c-0.3-0.3-0.6-0.4-1.1-0.4c-0.4,0-0.7,0.1-1,0.3c-0.3,0.2-0.5,0.5-0.7,0.9c-0.2,0.4-0.2,0.9-0.2,1.4
-<path class="st1" d="M5.4,10.6C5.4,9.1,6.6,8,8,8h11.8l-2,2c-0.3,0.3-0.3,0.9,0,1.2c0.3,0.3,0.9,0.3,1.2,0l3.4-3.4
+		c0,0.6,0.1,1,0.2,1.4c0.2,0.4,0.4,0.7,0.7,0.9c0.3,0.2,0.6,0.3,1,0.3c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.4-0.3,0.6-0.5
-	c0.2-0.1,0.3-0.4,0.3-0.7c0-0.2-0.1-0.5-0.3-0.6L19,3c-0.3-0.3-0.9-0.3-1.2,0c-0.3,0.3-0.3,0.9,0,1.2l2,2H8c-2.4,0-4.3,2-4.3,4.4
+		c0.1-0.2,0.2-0.5,0.3-0.8h2.3c0,0.7-0.2,1.3-0.5,1.8c-0.3,0.5-0.8,0.9-1.3,1.2C68.2,21.6,67.5,21.8,66.7,21.8z"/>
-	v8.1c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9V10.6z"/>
+	<path class="st1" d="M78.6,13.3c0-0.5-0.2-0.8-0.6-1.1c-0.3-0.3-0.8-0.4-1.4-0.4c-0.4,0-0.7,0.1-1,0.2c-0.3,0.1-0.5,0.3-0.6,0.5
-<path class="st1" d="M18.1,24H6.3l2-2c0.3-0.3,0.3-0.9,0-1.2c-0.3-0.3-0.9-0.3-1.2,0l-3.4,3.4c-0.2,0.1-0.3,0.4-0.3,0.7
+		c-0.1,0.2-0.2,0.4-0.2,0.7c0,0.2,0,0.4,0.1,0.5s0.2,0.3,0.4,0.4c0.2,0.1,0.4,0.2,0.6,0.3c0.2,0.1,0.5,0.2,0.7,0.2l1,0.2
-	c0,0.2,0.1,0.5,0.3,0.6L7.1,29c0.3,0.3,0.9,0.3,1.2,0c0.3-0.3,0.3-0.9,0-1.2l-2-2h11.8c2.4,0,4.3-2,4.3-4.4v-8.1
+		c0.5,0.1,1,0.3,1.4,0.5s0.8,0.4,1.1,0.7s0.6,0.6,0.7,1c0.2,0.4,0.3,0.8,0.3,1.3c0,0.7-0.2,1.3-0.5,1.8c-0.4,0.5-0.9,0.9-1.5,1.2
-	c0-0.5-0.4-0.9-0.9-0.9c-0.5,0-0.9,0.4-0.9,0.9v8.1C20.7,22.9,19.5,24,18.1,24z"/>
+		c-0.7,0.3-1.5,0.4-2.4,0.4c-0.9,0-1.8-0.1-2.5-0.4c-0.7-0.3-1.2-0.7-1.6-1.3c-0.4-0.6-0.6-1.3-0.6-2.1h2.4c0,0.4,0.1,0.7,0.3,1
+		c0.2,0.3,0.5,0.5,0.8,0.6s0.7,0.2,1.1,0.2c0.4,0,0.8-0.1,1.1-0.2c0.3-0.1,0.5-0.3,0.7-0.5c0.2-0.2,0.3-0.5,0.3-0.7
+		c0-0.3-0.1-0.5-0.2-0.7c-0.2-0.2-0.4-0.3-0.7-0.5c-0.3-0.1-0.7-0.2-1.1-0.3l-1.3-0.3c-1-0.2-1.8-0.6-2.3-1.1s-0.9-1.2-0.8-2.1
+		c0-0.7,0.2-1.3,0.6-1.8s0.9-0.9,1.6-1.2c0.7-0.3,1.4-0.4,2.3-0.4c0.9,0,1.6,0.1,2.3,0.4c0.6,0.3,1.1,0.7,1.5,1.2
+		c0.4,0.5,0.5,1.1,0.6,1.8H78.6z"/>
+	<path class="st1" d="M84.4,21.6L82,12.9h2.4l1.4,5.9h0.1l1.4-5.9h2.4l1.4,5.8h0.1l1.3-5.8H95l-2.4,8.7h-2.6l-1.5-5.5h-0.1L87,21.6
+		H84.4z"/>
+	<path class="st1" d="M98.8,21.8c-0.6,0-1.1-0.1-1.5-0.3s-0.8-0.5-1-0.9s-0.4-0.9-0.4-1.4c0-0.5,0.1-0.9,0.3-1.2
+		c0.2-0.3,0.4-0.6,0.7-0.8c0.3-0.2,0.7-0.4,1-0.5c0.4-0.1,0.8-0.2,1.2-0.2c0.5-0.1,0.9-0.1,1.2-0.2c0.3,0,0.5-0.1,0.7-0.2
+		c0.1-0.1,0.2-0.2,0.2-0.4v0c0-0.4-0.1-0.6-0.3-0.8c-0.2-0.2-0.5-0.3-1-0.3c-0.4,0-0.8,0.1-1,0.3c-0.3,0.2-0.4,0.4-0.5,0.7l-2.2-0.2
+		c0.1-0.5,0.3-1,0.7-1.4c0.3-0.4,0.8-0.7,1.3-0.9c0.5-0.2,1.1-0.3,1.8-0.3c0.5,0,0.9,0.1,1.4,0.2c0.4,0.1,0.8,0.3,1.2,0.5
+		c0.3,0.2,0.6,0.5,0.8,0.9c0.2,0.4,0.3,0.8,0.3,1.3v5.9h-2.3v-1.2h-0.1c-0.1,0.3-0.3,0.5-0.6,0.7c-0.2,0.2-0.5,0.4-0.8,0.5
+		C99.6,21.7,99.2,21.8,98.8,21.8z M99.5,20.1c0.4,0,0.7-0.1,0.9-0.2s0.5-0.3,0.6-0.6c0.2-0.2,0.2-0.5,0.2-0.8v-0.9
+		c-0.1,0-0.2,0.1-0.3,0.1s-0.3,0.1-0.4,0.1s-0.3,0.1-0.5,0.1c-0.2,0-0.3,0-0.4,0.1c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.2-0.5,0.4
+		c-0.1,0.2-0.2,0.3-0.2,0.6c0,0.3,0.1,0.6,0.4,0.8C98.8,20,99.1,20.1,99.5,20.1z"/>
+	<path class="st1" d="M105.6,24.9v-12h2.4v1.5h0.1c0.1-0.2,0.3-0.5,0.5-0.7c0.2-0.2,0.5-0.4,0.8-0.6c0.3-0.2,0.7-0.2,1.2-0.2
+		c0.6,0,1.2,0.2,1.8,0.5c0.5,0.3,1,0.8,1.3,1.5s0.5,1.5,0.5,2.5c0,1-0.2,1.8-0.5,2.5c-0.3,0.7-0.7,1.2-1.3,1.5
+		c-0.5,0.3-1.1,0.5-1.8,0.5c-0.5,0-0.9-0.1-1.2-0.2c-0.3-0.2-0.6-0.4-0.8-0.6c-0.2-0.2-0.4-0.5-0.5-0.7H108v4.7H105.6z M107.9,17.2
+		c0,0.5,0.1,1,0.2,1.4c0.1,0.4,0.4,0.7,0.6,0.9c0.3,0.2,0.6,0.3,1,0.3c0.4,0,0.7-0.1,1-0.3c0.3-0.2,0.5-0.5,0.6-0.9
+		c0.1-0.4,0.2-0.8,0.2-1.3c0-0.5-0.1-0.9-0.2-1.3c-0.1-0.4-0.3-0.7-0.6-0.9c-0.3-0.2-0.6-0.3-1-0.3c-0.4,0-0.7,0.1-1,0.3
+		c-0.3,0.2-0.5,0.5-0.6,0.9C108,16.3,107.9,16.7,107.9,17.2z"/>
+</g>
 </svg>

basicswap/static/js/coin_icons.js

@@ -0,0 +1,70 @@
+// Define a cache object to store selected option data
+const selectCache = {};
+
+// Function to update the cache with the selected option data for a given select element
+function updateSelectCache(select) {
+  const selectedOption = select.options[select.selectedIndex];
+  const image = selectedOption.getAttribute('data-image');
+  const name = selectedOption.textContent.trim();
+  selectCache[select.id] = { image, name };
+}
+
+// Function to set the selected option and associated image and name for a given select element
+
+
+function setSelectData(select) {
+  const selectedOption = select.options[select.selectedIndex];
+  const image = selectedOption.getAttribute('data-image') || '/static/images/other/coin.png'; // set a default image URL
+  const name = selectedOption.textContent.trim();
+  if (image) {
+    select.style.backgroundImage = `url(${image})`;
+    select.nextElementSibling.querySelector('.select-image').src = image;
+  } else {
+    select.style.backgroundImage = '';
+    select.nextElementSibling.querySelector('.select-image').src = '';
+  }
+  select.nextElementSibling.querySelector('.select-name').textContent = name;
+  updateSelectCache(select);
+}
+
+
+// Function to get the selected option data from cache for a given select element
+function getSelectData(select) {
+  return selectCache[select.id] || {};
+}
+
+// Update all custom select elements on the page
+const selects = document.querySelectorAll('.custom-select .select');
+selects.forEach((select) => {
+  // Set the initial select data based on the cached data (if available) or the selected option (if any)
+  const cachedData = getSelectData(select);
+  if (cachedData.image) {
+    select.style.backgroundImage = `url(${cachedData.image})`;
+    select.nextElementSibling.querySelector('.select-image').src = cachedData.image;
+  }
+  if (cachedData.name) {
+    select.nextElementSibling.querySelector('.select-name').textContent = cachedData.name;
+  }
+  if (select.selectedIndex >= 0) {
+    setSelectData(select);
+  }
+
+  // Add event listener to update select data when an option is selected
+  select.addEventListener('change', () => {
+    setSelectData(select);
+  });
+});
+
+// Hide the select image and name on page load
+const selectIcons = document.querySelectorAll('.custom-select .select-icon');
+const selectImages = document.querySelectorAll('.custom-select .select-image');
+const selectNames = document.querySelectorAll('.custom-select .select-name');
+selectIcons.forEach((icon) => {
+  icon.style.display = 'none';
+});
+selectImages.forEach((image) => {
+  image.style.display = 'none';
+});
+selectNames.forEach((name) => {
+  name.style.display = 'none';
+});

basicswap/static/js/coin_icons_2.js

@@ -0,0 +1,60 @@
+// Define the function for setting up the custom select element
+function setupCustomSelect(select) {
+  const options = select.querySelectorAll('option');
+  const selectIcon = select.parentElement.querySelector('.select-icon');
+  const selectImage = select.parentElement.querySelector('.select-image');
+
+  // Set the background image for each option that has a data-image attribute
+  options.forEach(option => {
+    const image = option.getAttribute('data-image');
+    if (image) {
+      option.style.backgroundImage = `url(${image})`;
+    }
+  });
+
+  if (select.value == '-1') {
+    // Set the selected option based on the stored value
+    const storedValue = localStorage.getItem(select.name);
+    if (storedValue) {
+      select.value = storedValue;
+    }
+  }
+
+  // Set the selected option image based on the selected value
+  const selectedOption = select.querySelector(`option[value="${select.value}"]`);
+  if (selectedOption) {
+    const image = selectedOption.getAttribute('data-image');
+    if (image) {
+      select.style.backgroundImage = `url(${image})`;
+      selectImage.src = image;
+    }
+  }
+
+  // Update the select element and image when the user makes a selection
+  select.addEventListener('change', () => {
+    const selectedOption = select.options[select.selectedIndex];
+    const image = selectedOption.getAttribute('data-image');
+    if (image) {
+      select.style.backgroundImage = `url(${image})`;
+      selectImage.src = image;
+    } else {
+      select.style.backgroundImage = '';
+      selectImage.src = '';
+    }
+
+    // Save the selected value to localStorage
+    localStorage.setItem(select.name, select.value);
+  });
+
+  // Hide the select icon and image on page load
+  selectIcon.style.display = 'none';
+  selectImage.style.display = 'none';
+}
+
+// Call the setupCustomSelect function for each custom select element
+const customSelects = document.querySelectorAll('.custom-select select');
+customSelects.forEach(select => {
+  setupCustomSelect(select);
+});
+
+

basicswap/static/js/main.js

@@ -37,4 +37,4 @@ document.addEventListener('DOMContentLoaded', function() {
             });
         }
     }
-});
+});