Merge branch 'master' into mainnet

Author: dpad85

phoenix-android/build.gradle.kts

@@ -24,8 +24,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 33
-        versionCode = 64
-        versionName = "2.0.9"
+        versionCode = 65
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations.addAll(listOf("en", "fr", "de", "es", "cs", "pt-rBR"))
     }

phoenix-legacy/build.gradle.kts

@@ -31,7 +31,7 @@ android {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   buildTypes {
-    val libCode = 64
+    val libCode = 65
     getByName("debug") {
       resValue("string", "CHAIN", chain)
       buildConfigField("String", "CHAIN", chain)

phoenix-legacy/src/main/res/values-cs/strings.xml

@@ -273,6 +273,8 @@
   <string name="legacy_inappnotif_background_worker_cannot_run">Phoenix potřebuje běžet na pozadí čas od času. Ujistěte se, že vaše zařízení neukončuje agresivně tuto aplikaci kvůli šetření baterie.</string>
   <string name="legacy_inappnotif_upgrade">Je dostupná nová aktualizace.</string>
   <string name="legacy_inappnotif_upgrade_critical">Je dostupná kritická aktualizace. Peněženka nemusí fungovat správně pokud nebude aktualizována.</string>
+  <string name="legacy_inappnotif_prepare_migration">The old Phoenix will be gone soon. Time to upgrade!</string>
+  <string name="legacy_inappnotif_prepare_migration_action">Upgrade to the new Phoenix</string>
 
   <!-- //////////////// display seed //////////////// -->
 
@@ -420,7 +422,7 @@
   <!-- //////////////// Migration to KMP //////////////// -->
 
   <string name="legacy_migration_title">Phoenix upgrade</string>
-  <string name="legacy_migration_ready_message">Upgrade na nejnovější verzi Phoenixu se špičkovým Lightning enginem a novými funkcemi.\n\nVaše kanály budou sloučeny dohromady. Tento proces je automatizovaný.\n\nPo dokončení migrace již nepoužívejte staré výměnné adresy.</string>
+  <string name="legacy_migration_ready_message">Od 1. listopadu budou starší služby (swapy a kanály on-the-fly) vypnuty.\n\nUpgrade na nejnovější verzi Phoenixu se špičkovým Lightning enginem a novými funkcemi.\n\nVaše kanály budou sloučeny dohromady. Tento proces je automatizovaný.\n\nPo dokončení migrace již nepoužívejte staré výměnné adresy.</string>
   <string name="legacy_migration_prepare_button">Upgrade</string>
   <string name="legacy_migration_prepare_button_disconnected">Připojení…</string>
   <string name="legacy_migration_dismiss_button">Teď ne</string>

phoenix-legacy/src/main/res/values-de/strings.xml

@@ -399,6 +399,8 @@
   <string name="legacy_inappnotif_upgrade_critical">Ein kritisches Update ist verfügbar. Die Wallet könnte fehlerhaft funktionieren, wenn sie nicht aktualisiert wird.</string>
   <string name="legacy_inappnotif_mempool_high_usage">Bitcoin-Mempool ist voll und die Gebühren sind hoch.</string>
   <string name="legacy_inappnotif_mempool_high_usage_action">Sehen Sie, wie Phoenix betroffen ist</string>
+  <string name="legacy_inappnotif_prepare_migration">Der alte Phoenix wird bald verschwinden. Zeit für ein Upgrade!</string>
+  <string name="legacy_inappnotif_prepare_migration_action">Upgrade auf die neue Phoenix</string>
 
   <!-- //////////////// display seed //////////////// -->
 
@@ -818,7 +820,7 @@
   <!-- //////////////// Migration to KMP //////////////// -->
 
   <string name="legacy_migration_title">Phoenix Upgrade</string>
-  <string name="legacy_migration_ready_message">Upgrade auf die neueste Version von Phoenix, mit einer hochmodernen Lightning-Engine und neuen Funktionen.\n\nIhre Kanäle werden zusammengeführt. Dieser Prozess ist automatisiert.\n\nWenn die Migration abgeschlossen ist, sollten Sie Ihre alten Swap-Adressen nicht wieder verwenden.</string>
+  <string name="legacy_migration_ready_message">Ab dem 1. November werden die alten Dienste (Swaps und On-the-fly-Kanäle) deaktiviert.\n\nUpgrade auf die neueste Version von Phoenix, mit einer hochmodernen Lightning-Engine und neuen Funktionen.\n\nIhre Kanäle werden zusammengeführt. Dieser Prozess ist automatisiert.\n\nWenn die Migration abgeschlossen ist, sollten Sie Ihre alten Swap-Adressen nicht wieder verwenden.</string>
   <string name="legacy_migration_prepare_button">Upgrade</string>
   <string name="legacy_migration_prepare_button_disconnected">Verbindung herstellen…</string>
   <string name="legacy_migration_dismiss_button">Nicht jetzt</string>

phoenix-legacy/src/main/res/values-es/strings.xml

@@ -282,6 +282,8 @@
   <string name="legacy_inappnotif_background_worker_cannot_run">Phoenix necesita poder ejecutarse en segundo plano de vez en cuando. Asegúrate de que tu dispositivo no fuerce el cierre de esta aplicación para ahorrar batería.</string>
   <string name="legacy_inappnotif_upgrade">Hay una actualización disponible para esta aplicación.</string>
   <string name="legacy_inappnotif_upgrade_critical">Una actualización crítica está disponible. La aplicación puede funcionar mal si no se actualiza.</string>
+  <string name="legacy_inappnotif_prepare_migration">El viejo Phoenix desaparecerá pronto. Es hora de actualizarlo.</string>
+  <string name="legacy_inappnotif_prepare_migration_action">Actualizar al nuevo Phoenix</string>
 
   <!-- //////////////// display seed //////////////// -->
 
@@ -464,7 +466,7 @@
   <!-- //////////////// Migration to KMP //////////////// -->
 
   <string name="legacy_migration_title">Actualización de Phoenix</string>
-  <string name="legacy_migration_ready_message">Actualízate a la última versión de Phoenix, con un motor Lightning de última generación y nuevas funciones.\n\nSus canales se fusionarán. Este proceso está automatizado.\n\nUna vez finalizada la migración, no vuelva a utilizar sus antiguas direcciones de intercambio.</string>
+  <string name="legacy_migration_ready_message">A partir del 1 de noviembre, se desactivarán los servicios heredados (intercambios y canales on-the-fly).\n\nActualízate a la última versión de Phoenix, con un motor Lightning de última generación y nuevas funciones.\n\nSus canales se fusionarán. Este proceso está automatizado.\n\nUna vez finalizada la migración, no vuelva a utilizar sus antiguas direcciones de intercambio.</string>
   <string name="legacy_migration_prepare_button">Actualizar</string>
   <string name="legacy_migration_prepare_button_disconnected">Connecting…</string>
   <string name="legacy_migration_dismiss_button">Ahora no</string>

phoenix-legacy/src/main/res/values-fr/strings.xml

@@ -348,6 +348,8 @@
   <string name="legacy_inappnotif_background_worker_cannot_run">Phoenix surveille vos fonds même quand vous ne l\'utilisez pas. Assurez vous qu\'Android n\'empêche pas l\'application de fonctionner en arrière plan sous prétexte d\'optimisation de batterie.</string>
   <string name="legacy_inappnotif_upgrade">Une mise à jour pour cette application est disponible.</string>
   <string name="legacy_inappnotif_upgrade_critical">Une mise à jour critique est disponible. L\'application ne fonctionnera pas correctement si elle n\'est pas mise à jour.</string>
+  <string name="legacy_inappnotif_prepare_migration">L\'ancien Phoenix va bientôt tirer sa révérence. Il est temps de le mettre à niveau !</string>
+  <string name="legacy_inappnotif_prepare_migration_action">Passer à la nouvelle version</string>
 
   <!-- //////////////// display seed //////////////// -->
 
@@ -693,7 +695,7 @@
   <!-- //////////////// Migration to KMP //////////////// -->
 
   <string name="legacy_migration_title">Mise à niveau de Phoenix</string>
-  <string name="legacy_migration_ready_message">Passez à la nouvelle version de Phoenix, utilisant un moteur Lightning de dernière génération et de nouvelles fonctionnalités.\n\nLes canaux existants seront fusionnés. Ce processus de migration est automatisé.\n\nUne fois la migration faite, ne réutilisez pas vos anciennes adresses de swap.</string>
+  <string name="legacy_migration_ready_message">À partir du 1er novembre, les anciens services (échanges et canaux à la volée) seront désactivés.\n\nPassez à la nouvelle version de Phoenix, utilisant un moteur Lightning de dernière génération et de nouvelles fonctionnalités.\n\nLes canaux existants seront fusionnés. Ce processus de migration est automatisé.\n\nUne fois la migration faite, ne réutilisez pas vos anciennes adresses de swap.</string>
   <string name="legacy_migration_prepare_button">Mettre à jour</string>
   <string name="legacy_migration_prepare_button_disconnected">Connexion…</string>
   <string name="legacy_migration_dismiss_button">Plus tard</string>

phoenix-legacy/src/main/res/values-pt-rBR/strings.xml

@@ -372,6 +372,8 @@
   <string name="legacy_inappnotif_upgrade_critical">Uma atualização crítica está disponível. A carteira pode apresentar mau funcionamento se não for atualizada.</string>
   <string name="legacy_inappnotif_mempool_high_usage">O mempool da rede Bitcoin está cheio e com taxas altas.</string>
   <string name="legacy_inappnotif_mempool_high_usage_action">Veja como a Phoenix é afetada</string>
+  <string name="legacy_inappnotif_prepare_migration">A antiga Phoenix não existirá mais em breve. É hora de fazer um upgrade!</string>
+  <string name="legacy_inappnotif_prepare_migration_action">Atualizar para o novo Phoenix</string>
 
   <!-- //////////////// display seed //////////////// -->
 
@@ -754,7 +756,7 @@
   <!-- //////////////// Migration to KMP //////////////// -->
 
   <string name="legacy_migration_title">Atualização do Phoenix</string>
-  <string name="legacy_migration_ready_message">Atualize para a versão mais recente do Phoenix, com um mecanismo Lightning de ponta e novos recursos.\n\nSeus canais serão mesclados. Esse processo é automatizado.\n\nApós a conclusão da migração, não reutilize seus endereços de troca antigos.</string>
+  <string name="legacy_migration_ready_message">A partir de 1º de novembro, os serviços legados (swaps e canais on-the-fly) serão desativados.\n\nAtualize para a versão mais recente do Phoenix, com um mecanismo Lightning de ponta e novos recursos.\n\nSeus canais serão mesclados. Esse processo é automatizado.\n\nApós a conclusão da migração, não reutilize seus endereços de troca antigos.</string>
   <string name="legacy_migration_prepare_button">Upgrade</string>
   <string name="legacy_migration_prepare_button_disconnected">Conectando…</string>
   <string name="legacy_migration_dismiss_button">Não agora</string>

phoenix-legacy/src/main/res/values/strings.xml

@@ -388,8 +388,8 @@
   <string name="legacy_inappnotif_upgrade_critical">A critical update is available. The wallet may malfunction if not updated.</string>
   <string name="legacy_inappnotif_mempool_high_usage">Bitcoin mempool is full and fees are high.</string>
   <string name="legacy_inappnotif_mempool_high_usage_action">See how Phoenix is affected</string>
-  <string name="legacy_inappnotif_prepare_migration">Phoenix can upgrade to a new better version.</string>
-  <string name="legacy_inappnotif_prepare_migration_action">Prepare migration</string>
+  <string name="legacy_inappnotif_prepare_migration">The old Phoenix will be gone soon. Time to upgrade!</string>
+  <string name="legacy_inappnotif_prepare_migration_action">Upgrade to the new Phoenix</string>
 
   <!-- //////////////// display seed //////////////// -->
 
@@ -793,7 +793,7 @@ legacy_
   <!-- //////////////// Migration to KMP //////////////// -->
 
   <string name="legacy_migration_title">Phoenix upgrade</string>
-  <string name="legacy_migration_ready_message">Upgrade to the latest version of Phoenix, with a cutting-edge Lightning engine and new features.\n\nYour channels will be merged together. This process is automated.\n\nAfter migration is complete, do not re-use your old swap-in addresses.</string>
+  <string name="legacy_migration_ready_message">Starting from November 1st, legacy services (swaps and on-the-fly channels) will be disabled.\n\nUpgrade to the new version of Phoenix, with a cutting-edge Lightning engine and new features.\n\nYour channels will be merged together. This process is automated.\n\nAfter migration is complete, do not re-use your old swap-in addresses.</string>
   <string name="legacy_migration_prepare_button">Upgrade</string>
   <string name="legacy_migration_prepare_button_disconnected">Connecting…</string>
   <string name="legacy_migration_dismiss_button">Not now</string>
@@ -803,7 +803,7 @@ legacy_
   <string name="legacy_migration_paused_force_close">You cannot upgrade now: some channels are being force-closed.\n\nTry again later when these channel have been completely closed. Note that force-close can take several days to complete.</string>
   <string name="legacy_migration_paused_disconnected">You cannot upgrade now because you are disconnected from Lightning and/or Electrum.\n\nTry again later when connection has been established.</string>
 
-  <string name="legacy_migration_confirm_title">Confirm migration</string>
+  <string name="legacy_migration_confirm_title">Confirm upgrade</string>
   <string name="legacy_migration_confirm_dust">%1$d of %2$d channels are empty, or hold less than the Bitcoin dust limit (546 sat).\n\nThey will be closed, their balance if any will go to the Bitcoin miners, and their inbound liquidity will not be preserved.</string>
   <string name="legacy_migration_confirm_proceed">Proceed</string>
   <string name="legacy_migration_confirm_cancel">Cancel</string>
@@ -815,7 +815,7 @@ legacy_
   <string name="legacy_migration_closing_channels">Closing channels (%1$d/%2$d)</string>
   <string name="legacy_migration_monitoring_channels_publish">Publishing transactions (%1$s/%2$d)</string>
 
-  <string name="legacy_migration_complete_title">Migration complete</string>
+  <string name="legacy_migration_complete_title">Upgrade complete</string>
   <string name="legacy_migration_complete_details">Switching to the new app…</string>
 
   <string name="legacy_migration_failure_title">Upgrade has failed</string>