Merge branch 'master' into fix_electrum_tls_enabled_var

backend/src/api/fiat-conversion.ts

@@ -43,7 +43,7 @@ class FiatConversion {
           agentOptions: {
             keepAlive: true,
           },
-          host: config.SOCKS5PROXY.HOST,
+          hostname: config.SOCKS5PROXY.HOST,
           port: config.SOCKS5PROXY.PORT
         };
 

backend/src/sync-assets.ts

@@ -29,7 +29,7 @@ class SyncAssets {
             agentOptions: {
               keepAlive: true,
             },
-            host: config.SOCKS5PROXY.HOST,
+            hostname: config.SOCKS5PROXY.HOST,
             port: config.SOCKS5PROXY.PORT
           };
 

production/bitcoin.minfee.conf

@@ -2,10 +2,8 @@ datadir=/minfee
 server=1
 txindex=0
 listen=1
-discover=0
 daemon=1
 prune=1337
-maxconnections=1
 rpcallowip=127.0.0.1
 rpcuser=__BITCOIN_RPC_USER__
 rpcpassword=__BITCOIN_RPC_PASS__
@@ -15,4 +13,4 @@ rpcpassword=__BITCOIN_RPC_PASS__
 bind=127.0.0.1:8303
 rpcbind=127.0.0.1:8302
 rpcport=8302
-connect=127.0.0.1:8333
+addnode=127.0.0.1:8333