Merge pull request #83 from nahuhh/monero_v0.18.3.3

monero: v0.18.3.3 [dev branch]

basicswap/interface/xmr.py

@@ -85,7 +85,7 @@ class XMRInterface(CoinInterface):
 
         self.blocks_confirmed = coin_settings['blocks_confirmed']
         self._restore_height = coin_settings.get('restore_height', 0)
-        self.setFeePriority(coin_settings.get('fee_priority', 2))
+        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

basicswap/templates/settings.html

@@ -182,7 +182,7 @@
                 <div class="relative">
                 {{ input_arrow_down_svg| safe }}
                  <select class="hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-400 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" name="fee_priority_{{ c.name }}">
-                  <option value="0" {% if c.fee_priority==0 %} selected{% endif %}>[Auto] Slow</option>
+                  <option value="0" {% if c.fee_priority==0 %} selected{% endif %}>Auto</option>
                   <option value="1" {% if c.fee_priority==1 %} selected{% endif %}>Slow</option>
                   <option value="2" {% if c.fee_priority==2 %} selected{% endif %}>Normal</option>
                   <option value="3" {% if c.fee_priority==3 %} selected{% endif %}>Fast</option>

bin/basicswap_prepare.py

@@ -48,9 +48,9 @@ LITECOIN_VERSION_TAG = os.getenv('LITECOIN_VERSION_TAG', '')
 BITCOIN_VERSION = os.getenv('BITCOIN_VERSION', '26.0')
 BITCOIN_VERSION_TAG = os.getenv('BITCOIN_VERSION_TAG', '')
 
-MONERO_VERSION = os.getenv('MONERO_VERSION', '0.18.3.1')
+MONERO_VERSION = os.getenv('MONERO_VERSION', '0.18.3.3')
 MONERO_VERSION_TAG = os.getenv('MONERO_VERSION_TAG', '')
-XMR_SITE_COMMIT = '1bdb0d456943a224a4d6241b1bb713172e5fa29f'  # Lock hashes.txt to monero version
+XMR_SITE_COMMIT = 'd00169a6decd9470ebdf6a75e3351df4ebcd260a'  # Lock hashes.txt to monero version
 
 PIVX_VERSION = os.getenv('PIVX_VERSION', '5.6.1')
 PIVX_VERSION_TAG = os.getenv('PIVX_VERSION_TAG', '')