chore(release): stage v1.7.53-alpha

core/Cargo.lock

@@ -80,7 +80,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "archipelago"
-version = "1.7.52-alpha"
+version = "1.7.53-alpha"
 dependencies = [
  "anyhow",
  "archipelago-container",

core/archipelago/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "archipelago"
-version = "1.7.52-alpha"
+version = "1.7.53-alpha"
 edition = "2021"
 description = "Archipelago Bitcoin Node OS - Native backend"
 authors = ["Archipelago Team"]

core/archipelago/src/api/rpc/package/config.rs

@@ -164,11 +164,10 @@ pub(super) fn is_readonly_compatible(app_id: &str) -> bool {
 /// Get container health check arguments for podman run.
 /// Returns (health-cmd, interval, retries) args to append to run_args.
 pub(super) fn get_health_check_args(app_id: &str, _rpc_pass: &str) -> Vec<String> {
-    // bitcoin-cli reads the .cookie file from -datadir automatically (no plaintext creds needed)
-    let btc_health =
-        "bitcoin-cli -datadir=/home/bitcoin/.bitcoin getblockchaininfo || exit 1".to_string();
     let (cmd, interval, retries) = match app_id {
-        "bitcoin" | "bitcoin-core" | "bitcoin-knots" => (btc_health.as_str(), "30s", "3"),
+        // Bitcoin images do not consistently ship bitcoin-cli/curl/nc. Rely on
+        // process state here; manifests still describe the desired TCP check.
+        "bitcoin" | "bitcoin-core" | "bitcoin-knots" => return vec![],
         "lnd" => ("lncli getinfo || exit 1", "30s", "3"),
         "btcpay-server" | "btcpayserver" => {
             ("curl -sf http://localhost:49392/ || exit 1", "30s", "3")

core/archipelago/src/api/rpc/package/install.rs

@@ -260,7 +260,7 @@ impl RpcHandler {
                 // bitcoin_rpc_credentials() generates + persists on first
                 // call (OnceCell-cached), so this is idempotent.
                 let _ = crate::bitcoin_rpc::bitcoin_rpc_credentials().await;
-                ensure_bitcoin_rpc_bindings().await?
+                ensure_bitcoin_rpc_config().await?
             } else {
                 false
             };
@@ -1175,14 +1175,14 @@ impl RpcHandler {
         // user" and skip. Matches the lnd.conf behavior below.
         match tokio::fs::metadata(&conf_path).await {
             Ok(_) => {
-                ensure_bitcoin_rpc_bindings().await?;
-                info!("bitcoin.conf already exists, ensured RPC bind settings");
+                ensure_bitcoin_rpc_config().await?;
+                info!("bitcoin.conf already exists, ensured Bitcoin RPC config");
                 return Ok(());
             }
             Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
             Err(_) => {
-                ensure_bitcoin_rpc_bindings().await?;
-                info!("bitcoin.conf path inaccessible, ensured RPC bind settings via host helper");
+                ensure_bitcoin_rpc_config().await?;
+                info!("bitcoin.conf path inaccessible, ensured Bitcoin RPC config via host helper");
                 return Ok(());
             }
         }
@@ -1205,9 +1205,7 @@ impl RpcHandler {
 # rpcauth: salted hash only — no plaintext password in config or CLI\n\
 {}\n\
 server=1\n\
-rpcbind=0.0.0.0\n\
 rpcallowip=0.0.0.0/0\n\
-rpcport=8332\n\
 listen=1\n\
 printtoconsole=1\n",
             rpcauth_line
@@ -2029,7 +2027,7 @@ async fn wait_for_adopted_container(package_id: &str, container_name: &str) -> R
     ))
 }
 
-async fn ensure_bitcoin_rpc_bindings() -> Result<bool> {
+async fn ensure_bitcoin_rpc_config() -> Result<bool> {
     let script = r#"
 set -eu
 conf=/var/lib/archipelago/bitcoin/bitcoin.conf
@@ -2044,9 +2042,7 @@ ensure_line() {
     fi
 }
 ensure_line server=1
-ensure_line rpcbind=0.0.0.0
 ensure_line rpcallowip=0.0.0.0/0
-ensure_line rpcport=8332
 ensure_line listen=1
 [ "$changed" -eq 0 ] && exit 0
 exit 2

core/archipelago/src/api/rpc/update.rs

@@ -4,26 +4,9 @@ use anyhow::{Context, Result};
 
 impl RpcHandler {
     /// Check for available system updates.
-    /// Tries git-based check first (if repo exists), falls back to manifest-based.
+    /// Prefer manifest-based OTA so installed nodes with a checked-out repo do
+    /// not depend on a potentially stale git remote. Git remains a dev fallback.
     pub(super) async fn handle_update_check(&self) -> Result<serde_json::Value> {
-        // Manifest override: when ARCHIPELAGO_UPDATE_URL is explicitly set,
-        // the operator wants OTA via manifest — typically a dev box where
-        // ~/archy/.git exists but isn't the intended update surface.
-        // Without this short-circuit the dev box always advertises "Pull
-        // & Rebuild" and can never exercise the manifest OTA path.
-        let manifest_override = std::env::var("ARCHIPELAGO_UPDATE_URL").is_ok();
-
-        let repo_dir = std::path::PathBuf::from(
-            std::env::var("HOME").unwrap_or_else(|_| "/home/archipelago".to_string()),
-        )
-        .join("archy");
-        if !manifest_override && repo_dir.join(".git").exists() {
-            if let Ok(git_status) = self.git_check_update(&repo_dir).await {
-                return Ok(git_status);
-            }
-        }
-
-        // Fall back to manifest-based check
         let state = update::check_for_updates(&self.config.data_dir).await?;
 
         let update_info = state.available_update.as_ref().map(|u| {
@@ -35,10 +18,30 @@ impl RpcHandler {
             })
         });
 
+        if update_info.is_some() {
+            return Ok(serde_json::json!({
+                "current_version": state.current_version,
+                "last_check": state.last_check,
+                "update_available": true,
+                "update": update_info,
+                "manifest_mirror": state.manifest_mirror,
+            }));
+        }
+
+        let repo_dir = std::path::PathBuf::from(
+            std::env::var("HOME").unwrap_or_else(|_| "/home/archipelago".to_string()),
+        )
+        .join("archy");
+        if std::env::var("ARCHIPELAGO_GIT_UPDATES").is_ok() && repo_dir.join(".git").exists() {
+            if let Ok(git_status) = self.git_check_update(&repo_dir).await {
+                return Ok(git_status);
+            }
+        }
+
         Ok(serde_json::json!({
             "current_version": state.current_version,
             "last_check": state.last_check,
-            "update_available": update_info.is_some(),
+            "update_available": false,
             "update": update_info,
             "manifest_mirror": state.manifest_mirror,
         }))

core/archipelago/src/bootstrap.rs

@@ -304,10 +304,9 @@ fn path_dot(path: &Path) -> String {
 
 async fn run_bitcoin_rpc_repair() -> Result<bool> {
     // Older installs can have a container-owned bitcoin.conf with only rpcauth
-    // and printtoconsole. In that state bitcoind is healthy internally, but the
-    // host-network bitcoin-ui proxy to 127.0.0.1:8332 gets connection resets.
-    // Repair it at startup so OTA fixes existing nodes without a manual
-    // uninstall/reinstall.
+    // and printtoconsole. Repair it at startup so OTA fixes existing nodes
+    // without a manual uninstall/reinstall. Bind/port stay in the container
+    // command line to avoid duplicate RPC endpoint definitions.
     let script = r#"
 set -eu
 conf=/var/lib/archipelago/bitcoin/bitcoin.conf
@@ -322,9 +321,7 @@ ensure_line() {
     fi
 }
 ensure_line server=1
-ensure_line rpcbind=0.0.0.0
 ensure_line rpcallowip=0.0.0.0/0
-ensure_line rpcport=8332
 ensure_line listen=1
 [ "$changed" -eq 0 ] && exit 0
 exit 2