setup: add newline

bsx/setup.sh

@@ -45,7 +45,7 @@ enable_tor() {
 if   [[ "$particl_mnemonic" && "$monerod_addr" ]]; then
 	# Restore seed
 	PARTICL_MNEMONIC=$particl_mnemonic
-	XMR_RPC_HOST=$monerod_addr BASE_XMR_RPC_PORT=$monerod_port \
+	XMR_RPC_HOST=$monerod_addr XMR_RPC_PORT=$monerod_port \
 	basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero,wownero --xmrrestoreheight=$CURRENT_XMR_HEIGHT --wowrestoreheight=600000 --particl_mnemonic="$PARTICL_MNEMONIC"
 	enable_tor
 elif [[ "$particl_mnemonic" ]]; then
@@ -55,7 +55,7 @@ elif [[ "$particl_mnemonic" ]]; then
 	enable_tor
 elif [[ "$monerod_addr" ]]; then
 	# Setup new install and use a remote monero node
-	XMR_RPC_HOST=$monerod_addr BASE_XMR_RPC_PORT=$monerod_port \
+	XMR_RPC_HOST=$monerod_addr XMR_RPC_PORT=$monerod_port \
 	basicswap-prepare --datadir=$SWAP_DATADIR --withcoins=monero,wownero --xmrrestoreheight=$CURRENT_XMR_HEIGHT --wowrestoreheight=600000
 	$red"\n\nMake note of your seed above\n"; $nocolor
 	enable_tor
@@ -67,4 +67,4 @@ else
 fi
 
 $green"Install complete.\n\nUse 'basicswap-bash' to run, 'bsx-update' to update, and 'bsx-addcoin' to add a coin\n\nYou'll need to open a new login shell (a new terminal window) for the start scripts to be recognized.\n";$nocolor
-$red"XFCE will require you to logout / login";$nocolor
+$red"You may have to logout / login or open a new terminal window for the commands to be detected\n";$nocolor

bsx/update.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+COINCURVE=0.2
 cd $SWAP_DATADIR/basicswap
 
 # Download updated scripts
@@ -17,6 +18,18 @@ echo "Updating BasicSwapDEX" && sleep 1
 # Delete dangling build folder. Same as --no-cache for docker
 rm -rf $SWAP_DATADIR/basicswap/build
 
+# Coincurve
+cd $SWAP_DATADIR
+if [[ -d coincurve-basicswap ]]; then
+    cd coincurve-basicswap
+    git pull
+    git checkout basicswap_v$COINCURVE
+else
+    git clone https://github.com/basicswap/coincurve -b basicswap_v$COINCURVE coincurve-basicswap && cd $_
+fi
+$SWAP_DATADIR/venv/bin/pip install .
+
+# BasicSwap
 # Switch to new repo: basicswap/basicswap
 cd $SWAP_DATADIR/basicswap
 git remote set-url origin https://github.com/basicswap/basicswap

core_versions

@@ -1,6 +1,6 @@
 Bitcoin Core version v26.0.0
 dcrd version 1.8.1+release (Go version go1.21.1 linux/amd64)
-Dash Core version v20.0.2
+Dash Core version v21.1.0
 Firo Core Daemon version v0.14.14.0-ge0c423805
 Litecoin Core version v0.21.3
 Particl Core version v23.2.7.0