v0.0.11 - Improve startup UX: print version, visible mnemonic entry, retry up to 10 attempts, and support q/x quit

Dockerfile.alpine-musl

@@ -46,7 +46,10 @@ RUN cd /tmp && \
 
 # Copy and build nostr_core_lib from project resources
 COPY resources/nostr_core_lib /build/nostr_core_lib/
-RUN cd /build/nostr_core_lib && \
+RUN if [ "$(uname -m)" = "aarch64" ] && ! command -v aarch64-linux-gnu-gcc >/dev/null 2>&1; then \
+      ln -s "$(command -v gcc)" /usr/local/bin/aarch64-linux-gnu-gcc; \
+    fi && \
+    cd /build/nostr_core_lib && \
     chmod +x ./build.sh && \
     ./build.sh --nips=1,4,6,19,44
 
@@ -54,7 +57,14 @@ RUN cd /build/nostr_core_lib && \
 COPY src/ /build/src/
 
 # Build nsigner as a fully static binary
-RUN gcc -static -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -s -Wall -Wextra -std=c99 \
+RUN ARCH="$(uname -m)"; \
+    case "$ARCH" in \
+      aarch64|arm64) NOSTR_LIB="/build/nostr_core_lib/libnostr_core_arm64.a" ;; \
+      x86_64|amd64)  NOSTR_LIB="/build/nostr_core_lib/libnostr_core_x64.a" ;; \
+      *) echo "Unsupported build arch: $ARCH"; exit 1 ;; \
+    esac; \
+    [ -f "$NOSTR_LIB" ] || { echo "Missing nostr core lib: $NOSTR_LIB"; ls -la /build/nostr_core_lib; exit 1; }; \
+    gcc -static -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -s -Wall -Wextra -std=c99 \
       -I/build/nostr_core_lib \
       -I/build/nostr_core_lib/nostr_core \
       -I/build/nostr_core_lib/cjson \
@@ -70,7 +80,7 @@ RUN gcc -static -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -s -Wa
       /build/src/transport_frame.c \
       /build/src/key_store.c \
       /build/src/socket_name.c \
-    /build/nostr_core_lib/libnostr_core_x64.a \
+      "$NOSTR_LIB" \
       -o /build/nsigner_static \
       $(pkg-config --static --libs libcurl openssl) \
       -lsecp256k1 -lsqlite3 -lz -lpthread -lm

build_static.sh

@@ -105,12 +105,29 @@ echo "Platform:     $PLATFORM"
 echo "Output:       $BUILD_DIR/$OUTPUT_NAME"
 echo ""
 
+if [ "$ARCH" != "$HOST_ARCH" ]; then
+    echo "[0/3] Preparing buildx + QEMU for cross-architecture build"
+    if ! docker buildx inspect >/dev/null 2>&1; then
+        echo "ERROR: docker buildx is not available"
+        exit 1
+    fi
+    docker run --privileged --rm tonistiigi/binfmt --install all >/dev/null
+
+    if ! docker buildx inspect nsigner-builder >/dev/null 2>&1; then
+        docker buildx create --name nsigner-builder --driver docker-container --use >/dev/null
+    else
+        docker buildx use nsigner-builder >/dev/null
+    fi
+    docker buildx inspect --bootstrap >/dev/null
+fi
+
 echo "[1/3] Building builder stage from project root context"
-docker build \
+docker buildx build \
     --platform "$PLATFORM" \
     --target builder \
     -f "$DOCKERFILE" \
     -t "$IMAGE_TAG" \
+    --load \
     "$SCRIPT_DIR"
 
 echo "[2/3] Extracting static binary"

src/main.c

@@ -451,8 +451,8 @@ int socket_name_random(char *out, size_t out_len);
 /* Version information (auto-updated by build/version tooling) */
 #define NSIGNER_VERSION_MAJOR 0
 #define NSIGNER_VERSION_MINOR 0
-#define NSIGNER_VERSION_PATCH 9
-#define NSIGNER_VERSION "v0.0.9"
+#define NSIGNER_VERSION_PATCH 11
+#define NSIGNER_VERSION "v0.0.11"
 
 
 /* NSIGNER_HEADERLESS_DECLS_END */
@@ -807,7 +807,7 @@ static void render_status(const role_table_t *role_table,
     }
 
     printf("\nHotkeys\n-------\n");
-    printf("q quit  l lock/reunlock  r refresh  a toggle auto-approve(prompt): %s\n",
+    printf("q/x quit  l lock/reunlock  r refresh  a toggle auto-approve(prompt): %s\n",
            g_auto_approve ? "ON" : "OFF");
     fflush(stdout);
 }
@@ -836,14 +836,14 @@ static int prompt_load_mnemonic(mnemonic_state_t *mnemonic) {
     char phrase[MNEMONIC_MAX_LEN];
     char phrase_copy[MNEMONIC_MAX_LEN];
     char mode[MNEMONIC_MAX_LEN];
-    struct termios old_term;
-    struct termios new_term;
-    int have_term = 0;
+    int invalid_attempts = 0;
+    const int max_invalid_attempts = 10;
 
     if (mnemonic == NULL) {
         return -1;
     }
 
+    while (invalid_attempts < max_invalid_attempts) {
         printf("Mnemonic source: [E]nter existing or [G]enerate new (default E; you can also paste mnemonic here): ");
         fflush(stdout);
         if (read_line_stdin(mode, sizeof(mode)) != 0) {
@@ -851,14 +851,24 @@ static int prompt_load_mnemonic(mnemonic_state_t *mnemonic) {
             return -1;
         }
 
-    if (strchr(mode, ' ') != NULL && mode[0] != 'g' && mode[0] != 'G') {
-        if (mnemonic_load(mnemonic, mode) != 0) {
-            fprintf(stderr, "Invalid mnemonic (must be 12/15/18/21/24 words)\n");
+        if ((mode[0] == 'q' || mode[0] == 'Q' || mode[0] == 'x' || mode[0] == 'X') && mode[1] == '\0') {
+            fprintf(stderr, "User requested exit.\n");
             return -1;
         }
+
+        if (strchr(mode, ' ') != NULL && mode[0] != 'g' && mode[0] != 'G') {
+            if (mnemonic_load(mnemonic, mode) == 0) {
                 return 0;
             }
 
+            invalid_attempts++;
+            fprintf(stderr,
+                    "Invalid mnemonic (must be 12/15/18/21/24 words). Attempts: %d/%d\n",
+                    invalid_attempts,
+                    max_invalid_attempts);
+            continue;
+        }
+
         if (mode[0] == 'g' || mode[0] == 'G') {
             int idx = 1;
             char *ctx = NULL;
@@ -895,35 +905,32 @@ static int prompt_load_mnemonic(mnemonic_state_t *mnemonic) {
         printf("Enter mnemonic (12/15/18/21/24 words): ");
         fflush(stdout);
 
-    if (isatty(STDIN_FILENO) && tcgetattr(STDIN_FILENO, &old_term) == 0) {
-        new_term = old_term;
-        new_term.c_lflag &= (tcflag_t)~ECHO;
-        if (tcsetattr(STDIN_FILENO, TCSANOW, &new_term) == 0) {
-            have_term = 1;
-        }
-    }
-
         if (read_line_stdin(phrase, sizeof(phrase)) != 0) {
-        if (have_term) {
-            (void)tcsetattr(STDIN_FILENO, TCSANOW, &old_term);
-        }
             fprintf(stderr, "Failed to read mnemonic\n");
             return -1;
         }
 
-    if (have_term) {
-        (void)tcsetattr(STDIN_FILENO, TCSANOW, &old_term);
-        printf("\n");
-    }
-
-    if (mnemonic_load(mnemonic, phrase) != 0) {
+        if ((phrase[0] == 'q' || phrase[0] == 'Q' || phrase[0] == 'x' || phrase[0] == 'X') && phrase[1] == '\0') {
             memset(phrase, 0, sizeof(phrase));
-        fprintf(stderr, "Invalid mnemonic (must be 12/15/18/21/24 words)\n");
+            fprintf(stderr, "User requested exit.\n");
             return -1;
         }
 
+        if (mnemonic_load(mnemonic, phrase) == 0) {
             memset(phrase, 0, sizeof(phrase));
             return 0;
+        }
+
+        memset(phrase, 0, sizeof(phrase));
+        invalid_attempts++;
+        fprintf(stderr,
+                "Invalid mnemonic (must be 12/15/18/21/24 words). Attempts: %d/%d\n",
+                invalid_attempts,
+                max_invalid_attempts);
+    }
+
+    fprintf(stderr, "Too many invalid mnemonic attempts (%d). Exiting.\n", max_invalid_attempts);
+    return -1;
 }
 
 static void apply_test_overrides(policy_table_t *policy) {
@@ -1055,6 +1062,9 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
+    printf("nsigner %s\n", NSIGNER_VERSION);
+    fflush(stdout);
+
     mnemonic_init(&mnemonic);
     if (prompt_load_mnemonic(&mnemonic) != 0) {
         mnemonic_unload(&mnemonic);
@@ -1207,7 +1217,7 @@ int main(int argc, char *argv[]) {
             char ch = '\0';
             if (read(STDIN_FILENO, &ch, 1) > 0) {
                 ch = (char)tolower((unsigned char)ch);
-                if (ch == 'q') {
+                if (ch == 'q' || ch == 'x') {
                     g_running = 0;
                 } else if (ch == 'r') {
                     render_status(&role_table, &mnemonic, derived_count, socket_name);