Merge pull request #11 from nahuhh/mac_build

mac: fix workflow, addcoin, and update mac dependencies

Author: nahuhh

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
     types:
       - opened
       - reopened
-      - syncronize
+      - synchronize
   push:
 #    branches:
 #      - master
@@ -29,7 +29,7 @@ jobs:
   formatting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout/@v4
+    - uses: actions/checkout@v4
     - name: Install dependencies
       run: |
         npm install prettier prettier-plugin-sh --save-dev
@@ -89,7 +89,7 @@ jobs:
     name: 'macOS (brew)'
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout/@v4
+    - uses: actions/checkout@v4
     - name: Install basicswap-bash
       run: |
         ./basicswap-install.sh --new --tor --internal --regtest

bsx/addcoin.sh

@@ -22,9 +22,13 @@ manage_daemon_false() {
 
 ## Remote node
 detect_os_arch
-if [[ -z "${MACOS}" ]] && ! [[ "${local_only[@]}" =~ "${addcoin}" ]]; then
+if ! [[ "${local_only[@]}" =~ "${addcoin}" ]]; then
     # Set wallet name
-    ticker="${coin_map[$addcoin]}"
+    if [[ "${MACOS}" ]]; then
+        ticker="$(get_coin_ticker "${addcoin}")"
+    else
+        ticker="${coin_map[$addcoin]}"
+    fi
     wallet_env="${ticker}_WALLET_NAME"
     wallet_name="BSX_${ticker}"
 

bsx/shared.sh

@@ -54,6 +54,24 @@ if [[ -z "${MACOS}" ]]; then
     )
 fi
 
+# Coin map (Bash 3.2 compatible for MacOS)
+get_coin_ticker() {
+    case "$1" in
+        bitcoin) echo "BTC" ;;
+        bitcoincash) echo "BCH" ;;
+        dash) echo "DASH" ;;
+        decred) echo "DCR" ;;
+        dogecoin) echo "DOGE" ;;
+        firo) echo "FIRO" ;;
+        litecoin) echo "LTC" ;;
+        monero) echo "XMR" ;;
+        namecoin) echo "NMC" ;;
+        pivx) echo "PIVX" ;;
+        wownero) echo "WOW" ;;
+        *) red "Invalid coin \"$1\"" && exit 1 ;;
+    esac
+}
+
 # Activate venv
 activate_venv() {
     source $SWAP_DATADIR/venv/bin/activate
@@ -172,7 +190,7 @@ detect_os_arch() {
             green "Installing Homebrew"
             INSTALL="curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | /bin/bash && brew install"
         fi
-        DEPENDENCY="python gnupg pkg-config coreutils"
+        DEPENDENCY="python gnupg pkg-config coreutils zeromq"
         green "\n\nDetected MacOS"
     elif type -p dnf > /dev/null; then
         # Fedora