diff --git a/.github/workflows/manual_distribution.yml b/.github/workflows/manual_distribution.yml index 73b7fe33dd..27ccce0ad5 100644 --- a/.github/workflows/manual_distribution.yml +++ b/.github/workflows/manual_distribution.yml @@ -48,7 +48,7 @@ jobs: "firebase_app_id": "1:1039839682638:android:bbcfa8c9939ee993ea631f" }, "devnet": { - "firebase_app_id": "1:1039839682638:android:12d2ad31cc39093cea631f" + "firebase_app_id": "1:1039839682638:android:fdff563e24b69c5fea631f" } } diff --git a/docs/sakura-devnet.md b/docs/sakura-devnet.md new file mode 100644 index 0000000000..5384327a68 --- /dev/null +++ b/docs/sakura-devnet.md @@ -0,0 +1,38 @@ +# Sakura Devnet + +The `devnet` flavor targets `devnet-sakura`. Its application ID is +`org.dash.wallet.devnet`, reusing the existing Firebase-registered devnet app. +Only one devnet is supported at a time; this ID shares app storage with any +previously installed wallet using the same ID, but is separate from testnet and mainnet. +Wallet, chain, and bootstrap filenames use the existing `-sakura` suffix mechanism. +No DashJ release or key-derivation changes are required. + +## Prerequisites + +- No manual SDK install. The root `build.gradle` pins the legacy Platform SDK + (`dppVersion`, `5.0.0-20261016.200955-3`), which already has `NetworkConfiguration.sakura()` + and the explicit-network constructor, and the Kotlin SDK (`dashSdkVersion`, + `5.0.0-int31-20261019.192942-1`). Gradle resolves both from the snapshots repository. +- Set `sakuraSporkAddress` in local.properties or with `-PsakuraSporkAddress=...`. + This is the operator's public signing address, never a private key. No other + devnet's address is substituted. Missing values fail the devnet build; malformed + addresses are also rejected when constructing the network parameters. +- Core port defaults to `20001` by assumption; override with `-PsakuraCorePort=...`. + +Build with `./gradlew :wallet:assembleDevnetDebug`. +The local, Git-ignored `wallet/google-services.json` must contain +`org.dash.wallet.devnet` so Firebase-dependent startup workers can initialize. + +## Validation Still Required + +Core peers come from the Sakura status page's 13 validator IP addresses. +The SDK supplies HTTPS DAPI endpoints on port 1443. Core protocol is 70240. +DashJ's default devnet quorum and activation settings are retained as an explicit +testing assumption, not verified Sakura consensus configuration. + +Before funding the wallet, confirm Core synchronization, refresh the Platform +protocol version, check fresh block timestamps, and fetch a data contract with +proof verification enabled. The existing masternode-list quorum callback remains +in use; no proof verification or TLS validation is bypassed. + +Source: https://status.testnet.networks.dash.org/n/devnet-sakura/connect diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 94aa0eb102..726ce4045c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -21,7 +21,7 @@ FIREBASE_APP_IDS = { "prod" => "1:1039839682638:android:989eecd6db36de6a", "_testNet3" => "1:1039839682638:android:3202b16d460a1a88", "staging" => "1:1039839682638:android:bbcfa8c9939ee993ea631f", - "devnet" => "1:1039839682638:android:12d2ad31cc39093cea631f" + "devnet" => "1:1039839682638:android:fdff563e24b69c5fea631f" }.freeze def repo_root diff --git a/wallet/build.gradle b/wallet/build.gradle index c7fbfb719f..7858d2b0ad 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -250,6 +250,25 @@ if (file("../local.properties").exists()) { file("../local.properties").withInputStream { localProps.load(it) } } +def sakuraSporkAddress = providers.gradleProperty("sakuraSporkAddress") + .getOrElse(localProps.getProperty("sakuraSporkAddress", "")) +def sakuraCorePort = providers.gradleProperty("sakuraCorePort").getOrElse("20001").toInteger() +def validateSakuraConfiguration = tasks.register("validateSakuraConfiguration") { + doLast { + if (sakuraSporkAddress.trim().isEmpty()) { + throw new GradleException("Set sakuraSporkAddress to Sakura's public spork address before building devnet") + } + if (sakuraCorePort < 1 || sakuraCorePort > 65535) { + throw new GradleException("sakuraCorePort must be between 1 and 65535") + } + } +} +tasks.configureEach { + if (name.startsWith("preDevnet") && name.endsWith("Build")) { + dependsOn(validateSakuraConfiguration) + } +} + // Year of the most recent commit on the current branch, used for the copyright notice. // Uses providers.exec so it stays compatible with the Gradle configuration cache. // Falls back to the current year if git is unavailable (e.g. building from a source tarball). @@ -326,6 +345,8 @@ android { buildConfigField("String", "DASH_SDK_VERSION", "\"$dashSdkVersion\"") buildConfigField("int", "COMMIT_YEAR", "$commitYear") buildConfigField("String", "GIT_COMMIT", "\"$gitCommit\"") + buildConfigField("String", "SAKURA_SPORK_ADDRESS", groovy.json.JsonOutput.toJson(sakuraSporkAddress)) + buildConfigField("int", "SAKURA_CORE_PORT", sakuraCorePort.toString()) } buildTypes { @@ -378,16 +399,20 @@ android { } prod { manifest.srcFile 'prod/AndroidManifest.xml' + java.srcDirs += ['standard/src'] } _testNet3 { manifest.srcFile 'testNet3/AndroidManifest.xml' + java.srcDirs += ['standard/src'] res.srcDirs = ["testNet3/res"] } staging { res.srcDirs = ["staging/res"] + java.srcDirs += ['standard/src'] } devnet { res.srcDirs = ["devnet/res"] + java.srcDirs += ['devnet/src'] } } flavorDimensions "default" @@ -474,7 +499,7 @@ android { buildConfigField("String", "APPSFLYER_BRAND_DOMAIN", "\"dashpaytest.onelink.me\"") } devnet { - applicationId = "org.dash.dashpay.devnet" + applicationId = "org.dash.wallet.devnet" def imgurClientId = props.getProperty("UPHOLD_CLIENT_ID_SANDBOX") def imgurClientSecret = props.getProperty("UPHOLD_CLIENT_SECRET_SANDBOX") if (imgurClientId == null) { diff --git a/wallet/devnet/res/values/strings-extra.xml b/wallet/devnet/res/values/strings-extra.xml index 16c4ddbaa9..568f71927e 100644 --- a/wallet/devnet/res/values/strings-extra.xml +++ b/wallet/devnet/res/values/strings-extra.xml @@ -1,4 +1,4 @@ - Devnet + Sakura Devnet diff --git a/wallet/devnet/src/de/schildbach/wallet/service/platform/NetworkPlatform.kt b/wallet/devnet/src/de/schildbach/wallet/service/platform/NetworkPlatform.kt new file mode 100644 index 0000000000..4ab2b6ebdf --- /dev/null +++ b/wallet/devnet/src/de/schildbach/wallet/service/platform/NetworkPlatform.kt @@ -0,0 +1,11 @@ +package de.schildbach.wallet.service.platform + +import de.schildbach.wallet.network.SakuraDevNetParams +import org.bitcoinj.core.NetworkParameters +import org.dashj.platform.sdk.client.NetworkConfiguration +import org.dashj.platform.sdk.platform.Platform + +internal fun createNetworkPlatform(params: NetworkParameters): Platform { + require(params is SakuraDevNetParams) { "The devnet flavor requires Sakura parameters" } + return Platform(params, NetworkConfiguration.sakura()) +} diff --git a/wallet/res/values-de/strings-dashpay.xml b/wallet/res/values-de/strings-dashpay.xml index 6018364e72..63c31d5fe2 100644 --- a/wallet/res/values-de/strings-dashpay.xml +++ b/wallet/res/values-de/strings-dashpay.xml @@ -434,7 +434,7 @@ Benutzernamen + was ist die Abstimmung über Nutzernamen\? Nur Buchstaben, Zahlen und Bindestriche Nummern 2-9 - Du benötigst 0,25 DASH um einen Benutzernamen erstellen zu können + Du benötigst %s DASH um einen Benutzernamen erstellen zu können Der Nutzername muss eine dieser Kriterien entsprechen Der Nutzername muss diesen Kriterien entsprechen Zwischen 3 und 23 Zeichen diff --git a/wallet/res/values-el/strings-dashpay.xml b/wallet/res/values-el/strings-dashpay.xml index 262960b130..97286a9a68 100644 --- a/wallet/res/values-el/strings-dashpay.xml +++ b/wallet/res/values-el/strings-dashpay.xml @@ -426,7 +426,7 @@ + τι είναι η ψηφοφορία ονόματος χρήστη; Μόνο γράμματα, αριθμοί και παύλες Αριθμοί 2-9 - Πρέπει να έχετε 0,25 DASH για να δημιουργήσετε αυτό το όνομα χρήστη + Πρέπει να έχετε %s DASH για να δημιουργήσετε αυτό το όνομα χρήστη Το όνομα χρήστη πρέπει να πληροί ένα από τα ακόλουθα κριτήρια Το όνομα χρήστη πρέπει να πληροί τα εξής κριτήρια Μεταξύ 3 και 23 χαρακτήρων diff --git a/wallet/res/values-es/strings-dashpay.xml b/wallet/res/values-es/strings-dashpay.xml index a511405d36..92b0f742ae 100644 --- a/wallet/res/values-es/strings-dashpay.xml +++ b/wallet/res/values-es/strings-dashpay.xml @@ -434,7 +434,7 @@ de Dash + ¿Qué es la votación por nombre de usuario\? Solo letras, números y guiones Números 2-9 - Necesitas tener 0,25 DASH para crear este nombre de usuario + Necesitas tener %s DASH para crear este nombre de usuario El usuario debe someterse a uno de estos criterios El usuario debe someterse a estos criterios Entre 3 y 23 caracteres diff --git a/wallet/res/values-fa/strings-dashpay.xml b/wallet/res/values-fa/strings-dashpay.xml index 0f5f577d00..fa24cf1090 100644 --- a/wallet/res/values-fa/strings-dashpay.xml +++ b/wallet/res/values-fa/strings-dashpay.xml @@ -425,7 +425,7 @@ + رای‌گیری نام کاربری چیست حرف، عدد و خط‌تیره اعداد ۲ تا ۹ - برا ایجاد نام کاربری باید ۰.۲۵ دش داشته باشید + برا ایجاد نام کاربری باید %s دش داشته باشید نام کاربری باید یکی از معیارهای زیر را شامل شود نام کاربری باید معیارهای زیر را شامل شود بین ۳ تا ۲۳ کاراکتر diff --git a/wallet/res/values-fil/strings-dashpay.xml b/wallet/res/values-fil/strings-dashpay.xml index 90acdfc8d0..affcb5b559 100644 --- a/wallet/res/values-fil/strings-dashpay.xml +++ b/wallet/res/values-fil/strings-dashpay.xml @@ -426,7 +426,7 @@ Username + ano ang pagboto ng username\? Mga titik, numero at gitling lamang Bilang 2-9 - Kailangan mong magkaroon ng 0.25 DASH para magawa ang username na ito + Kailangan mong magkaroon ng %s DASH para magawa ang username na ito Dapat matugunan ng username ang isa sa mga pamantayang ito Dapat matugunan ng username ang mga pamantayang ito Sa pagitan ng 3 at 23 na mga karakter diff --git a/wallet/res/values-fr/strings-dashpay.xml b/wallet/res/values-fr/strings-dashpay.xml index 83fd2a2695..190383eabe 100644 --- a/wallet/res/values-fr/strings-dashpay.xml +++ b/wallet/res/values-fr/strings-dashpay.xml @@ -433,7 +433,7 @@ + qu\'est-ce que le vote de nom d\'utilisateur \? Lettres, chiffres et tirets seulement Chiffres 2 à 9 - Vous devez avoir 0,25 dashs pour créer ce nom d\'utilisateur + Vous devez avoir %s dashs pour créer ce nom d\'utilisateur Le nom d\'utilisateur doit répondre à un de ces critères Le nom d\'utilisateur doit répondre à ces critères entre 3 et 23 caractères diff --git a/wallet/res/values-id/strings-dashpay.xml b/wallet/res/values-id/strings-dashpay.xml index 63fcd76ecf..5ea3d17178 100644 --- a/wallet/res/values-id/strings-dashpay.xml +++ b/wallet/res/values-id/strings-dashpay.xml @@ -426,7 +426,7 @@ Dash anda + apa itu voting nama pengguna\? Hanya huruf, angka, dan tanda hubung Nomor 2-9 - Anda perlu memiliki 0.25 DASH untuk membuat nama pengguna ini + Anda perlu memiliki %s DASH untuk membuat nama pengguna ini Nama pengguna harus memenuhi salah satu kriteria berikut Nama pengguna harus memenuhi kriteria berikut Antara 3 dan 23 karakter diff --git a/wallet/res/values-it/strings-dashpay.xml b/wallet/res/values-it/strings-dashpay.xml index 645cbcea19..2ef60da989 100644 --- a/wallet/res/values-it/strings-dashpay.xml +++ b/wallet/res/values-it/strings-dashpay.xml @@ -434,7 +434,7 @@ Username + cos\'è la votazione del nome utente\? Solo lettere, numeri e trattini Numeri 2-9 - Devi avere 0,25 DASH per creare questo nome utente + Devi avere %s DASH per creare questo nome utente Lo Username deve soddisfare uno di questi criteri Lo username deve soddisfare questi criteri Tra 3 e 23 caratteri diff --git a/wallet/res/values-ja/strings-dashpay.xml b/wallet/res/values-ja/strings-dashpay.xml index c498d0e6df..89ab22894b 100644 --- a/wallet/res/values-ja/strings-dashpay.xml +++ b/wallet/res/values-ja/strings-dashpay.xml @@ -425,7 +425,7 @@ +ユーザー名投票とは\? 英字、数字、ハイフンのみ 2〜9の数字 - このユーザー名を作成するには、0.25DASHが必要です + このユーザー名を作成するには、%sDASHが必要です ユーザー名は、このいずれかの要件を満たす必要があります ユーザー名は、これらの要件を全て満たす必要があります 3〜23文字以内 diff --git a/wallet/res/values-ko/strings-dashpay.xml b/wallet/res/values-ko/strings-dashpay.xml index c97b59d132..aa1f26569d 100644 --- a/wallet/res/values-ko/strings-dashpay.xml +++ b/wallet/res/values-ko/strings-dashpay.xml @@ -426,7 +426,7 @@ + 사용자 이름 투표란 무엇인가요\? 글자, 숫자 및 하이픈만 사용할 수 있습니다. 숫자 2-9 - 이 사용자 이름을 생성하기 위해서는 0.25 DASH가 필요합니다 + 이 사용자 이름을 생성하기 위해서는 %s DASH가 필요합니다 사용자 이름은 다음의 조건 중 하나를 충족해야 합니다 사용자 이름은 다음의 조건을 충족해야 합니다 3에서 23글자 사이 diff --git a/wallet/res/values-nl/strings-dashpay.xml b/wallet/res/values-nl/strings-dashpay.xml index 9162ca2e0a..d78fc33e02 100644 --- a/wallet/res/values-nl/strings-dashpay.xml +++ b/wallet/res/values-nl/strings-dashpay.xml @@ -427,7 +427,7 @@ gebruikersnaam + wat is stemmen met gebruikersnaam\? Alleen letters, cijfers en koppeltekens Cijfers 2-9 - Je hebt 0,25 DASH nodig om deze gebruikersnaam aan te maken + Je hebt %s DASH nodig om deze gebruikersnaam aan te maken De gebruikersnaam moet aan een van deze criteria voldoen De gebruikersnaam moet aan deze criteria voldoen Tussen 3 en 23 tekens diff --git a/wallet/res/values-pl/strings-dashpay.xml b/wallet/res/values-pl/strings-dashpay.xml index d99a1c956f..30d6f43784 100644 --- a/wallet/res/values-pl/strings-dashpay.xml +++ b/wallet/res/values-pl/strings-dashpay.xml @@ -433,7 +433,7 @@ + Czym jest głosowanie na nazwę użytkownika\? Tylklko litery, cyfry i myślniki są dozwolone Numer 2-9 - Aby stworzyć tę nazwę użytkownika, musisz mieć 0,25 DASH + Aby stworzyć tę nazwę użytkownika, musisz mieć %s DASH Nazwa użytkownika musi spełniać jedno z tych kryterii Nazwa użytkownika musi spełniać te kryteria Pomiędzy 3 a 23 znakami diff --git a/wallet/res/values-pt/strings-dashpay.xml b/wallet/res/values-pt/strings-dashpay.xml index e83f741b7d..4c5e9d8148 100644 --- a/wallet/res/values-pt/strings-dashpay.xml +++ b/wallet/res/values-pt/strings-dashpay.xml @@ -434,7 +434,7 @@ Dash + o que é votação de nome de usuário\?  Apenas letras, números e hífens Números 2-9 - Você precisa ter 0,25 DASH para criar este nome de usuário + Você precisa ter %s DASH para criar este nome de usuário O nome de usuário deve atender a um dos seguintes critérios O nome de usuário deve atender a estes critérios Entre 3 e 23 caracteres diff --git a/wallet/res/values-ru/strings-dashpay.xml b/wallet/res/values-ru/strings-dashpay.xml index a33232617e..2470c30b63 100644 --- a/wallet/res/values-ru/strings-dashpay.xml +++ b/wallet/res/values-ru/strings-dashpay.xml @@ -434,7 +434,7 @@ Dash + что такое голосование за имя пользователя\? Только буквы, цифры и дефисы Цифры 2-9 - Чтобы создать это имя пользователя, у вас должно быть 0.25 DASH + Чтобы создать это имя пользователя, у вас должно быть %s DASH Имя пользователя должно соответствовать одному из этих условий: Имя пользователя должно соответствовать этим условиям: От 3 до 23 символов diff --git a/wallet/res/values-sk/strings-dashpay.xml b/wallet/res/values-sk/strings-dashpay.xml index 1e0e3a084f..d3a255b8c4 100644 --- a/wallet/res/values-sk/strings-dashpay.xml +++ b/wallet/res/values-sk/strings-dashpay.xml @@ -426,7 +426,7 @@ používateľské meno + čo je to hlasovanie o používateľskom mene\? Iba písmená, čísla a spojovníky Čísla 2-9 - Na vytvorenie tohto používateľského mena potrebujete mať 0,25 DASH + Na vytvorenie tohto používateľského mena potrebujete mať %s DASH Používateľské meno musí spĺňať jedno z týchto kritérií Používateľské meno musí spĺňať tieto kritériá Medzi 3 a 23 znakmi diff --git a/wallet/res/values-tr/strings-dashpay.xml b/wallet/res/values-tr/strings-dashpay.xml index 6b71063eeb..8393883d15 100644 --- a/wallet/res/values-tr/strings-dashpay.xml +++ b/wallet/res/values-tr/strings-dashpay.xml @@ -366,7 +366,7 @@ + kullanıcı adı oylaması nedir\? Yalnızca harfler, sayılar ve kısa çizgiler - Bu kullanıcı adını oluşturmak için 0.25 DASH\'a sahip olmanız gerekiyor + Bu kullanıcı adını oluşturmak için %s DASH\'a sahip olmanız gerekiyor 3 ile 23 karakter arasında Kabul ediyorum Al diff --git a/wallet/res/values-uk/strings-dashpay.xml b/wallet/res/values-uk/strings-dashpay.xml index ae3478e51b..a1acbed3ba 100644 --- a/wallet/res/values-uk/strings-dashpay.xml +++ b/wallet/res/values-uk/strings-dashpay.xml @@ -425,7 +425,7 @@ + що таке голосування за імʼя користувача\? Лише літери, цифри та дефіси Числа 2-9 - Для створення цього імені користувача потрібно мати 0,25 DASH + Для створення цього імені користувача потрібно мати %s DASH Ім’я користувача повинно відповідати одному з цих критеріїв Ім’я користувача повинно відповідати цим критеріям Від 3 до 23 символів diff --git a/wallet/res/values-zh-rTW/strings-dashpay.xml b/wallet/res/values-zh-rTW/strings-dashpay.xml index 1dbe1eaf5a..d99f543595 100644 --- a/wallet/res/values-zh-rTW/strings-dashpay.xml +++ b/wallet/res/values-zh-rTW/strings-dashpay.xml @@ -426,7 +426,7 @@ + 什麼是用戶名投票\? 僅限字母、數字和連字符 數字 2-9 - 您需要 0.25 DASH 才能建立此使用這個用戶名 + 您需要 %s DASH 才能建立此用戶名 用戶名必須符合以下標準之一 用戶名必須符合這些標準 名稱介乎3 到 23 個字元之間 diff --git a/wallet/res/values-zh/strings-dashpay.xml b/wallet/res/values-zh/strings-dashpay.xml index 7ea9131572..5c26390c17 100644 --- a/wallet/res/values-zh/strings-dashpay.xml +++ b/wallet/res/values-zh/strings-dashpay.xml @@ -426,7 +426,7 @@ + 什么是用户名投票\? 仅限字母, 数字和连字符 数字 2-9 - 您需要拥有 0.25 DASH 来创建此用户名 + 您需要拥有 %s DASH 来创建此用户名 用户名必须符合以下任一条件 用户名必须符合以下条件 3-23个字符之间 diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml index a4059020d7..95e8f1a2e8 100644 --- a/wallet/res/values/strings-dashpay.xml +++ b/wallet/res/values/strings-dashpay.xml @@ -465,7 +465,7 @@ runtime always sets request_username_balance_requirement_amount with the real path-dependent amount. Kept (with its translations) purely to avoid translation churn; do not add new usages. --> - You need to have 0.25 DASH to create this username + You need to have %s DASH to create this username diff --git a/wallet/src/de/schildbach/wallet/Constants.java b/wallet/src/de/schildbach/wallet/Constants.java index 25b58aafb1..13450b3eab 100644 --- a/wallet/src/de/schildbach/wallet/Constants.java +++ b/wallet/src/de/schildbach/wallet/Constants.java @@ -31,7 +31,7 @@ import org.bitcoinj.crypto.ChildNumber; import org.bitcoinj.params.DevNetParams; import org.bitcoinj.params.MainNetParams; -import org.bitcoinj.params.OuzoDevNetParams; +import de.schildbach.wallet.network.SakuraDevNetParams; import org.bitcoinj.params.TestNet3Params; import org.dash.wallet.common.money.MonetaryFormat; import org.bitcoinj.wallet.DeterministicKeyChain; @@ -138,7 +138,8 @@ public final class Constants { } case "devnet": { BIP44_PATH = DeterministicKeyChain.BIP44_ACCOUNT_ZERO_PATH_TESTNET; - NETWORK_PARAMETERS = OuzoDevNetParams.get(); + NETWORK_PARAMETERS = SakuraDevNetParams.create( + BuildConfig.SAKURA_SPORK_ADDRESS, BuildConfig.SAKURA_CORE_PORT); String devNetName = ((DevNetParams)NETWORK_PARAMETERS).getDevNetName(); devNetName = devNetName.substring(devNetName.indexOf("-") + 1); DNS_SEED = NETWORK_PARAMETERS.getDnsSeeds(); @@ -152,7 +153,7 @@ public final class Constants { SUPPORTS_CONNECT = true; SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_HEADERS_MN_LIST_FIRST); SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_BLOCKS_AFTER_PREPROCESSING); - org.dash.wallet.common.util.Constants.FAUCET_URL = String.format("http://faucet.%s.networks.dash.org/", devNetName); + org.dash.wallet.common.util.Constants.FAUCET_URL = String.format("https://faucet.%s.networks.dash.org/", devNetName); org.dash.wallet.common.util.Constants.INSTANCE.setEXPLORE_GC_FILE_PATH("explore/explore-v3-devnet.db"); break; } diff --git a/wallet/src/de/schildbach/wallet/network/SakuraDevNetParams.java b/wallet/src/de/schildbach/wallet/network/SakuraDevNetParams.java new file mode 100644 index 0000000000..16e6d9b0ef --- /dev/null +++ b/wallet/src/de/schildbach/wallet/network/SakuraDevNetParams.java @@ -0,0 +1,41 @@ +package de.schildbach.wallet.network; + +import org.bitcoinj.core.Address; +import org.bitcoinj.params.DevNetParams; + +/** Wallet-local configuration; consensus defaults are inherited from DashJ. */ +public final class SakuraDevNetParams extends DevNetParams { + private static final String[] PEERS = { + "68.67.122.86", "68.67.122.87", "68.67.122.240", "68.67.122.241", + "68.67.122.88", "68.67.122.89", "68.67.122.90", "68.67.122.91", + "68.67.122.92", "68.67.122.93", "68.67.122.94", "68.67.122.95", + "68.67.122.232" + }; + + private SakuraDevNetParams(String sporkAddress, int port) { + super("sakura", sporkAddress, port, PEERS.clone(), true, 70240); + Address.fromBase58(this, sporkAddress); + } + + public static synchronized SakuraDevNetParams create(String sporkAddress, int port) { + if (sporkAddress == null || sporkAddress.trim().isEmpty()) { + throw new IllegalArgumentException("Set sakuraSporkAddress to Sakura's public spork address"); + } + if (port < 1 || port > 65535) { + throw new IllegalArgumentException("sakuraCorePort must be between 1 and 65535"); + } + SakuraDevNetParams params = new SakuraDevNetParams(sporkAddress, port); + DevNetParams.add(params); + return params; + } + + @Override + public String[] getDefaultMasternodeList() { + return PEERS.clone(); + } + + @Override + public String[] getDefaultHPMasternodeList() { + return PEERS.clone(); + } +} diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt index 07d9385f18..bf88c8a458 100644 --- a/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt +++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt @@ -134,7 +134,7 @@ class PlatformServiceImplementation @Inject constructor( val walletDataProvider: WalletData ) : PlatformService { // none of the following should be initialized if platform is not supported - private val _platform by platformLazy { Platform(Constants.NETWORK_PARAMETERS) } + private val _platform by platformLazy { createNetworkPlatform(Constants.NETWORK_PARAMETERS) } override val platform: Platform get() = _platform!! private val _profiles by platformLazy { Profiles(platform) } @@ -248,7 +248,12 @@ class PlatformServiceImplementation @Inject constructor( override fun setMasternodeListManager(masternodeListManager: SimplifiedMasternodeListManager) { this.masternodeListManager = masternodeListManager + val configuredAddresses = platform.client.dapiAddressListProvider platform.setMasternodeListManager(masternodeListManager) + if (params is de.schildbach.wallet.network.SakuraDevNetParams) { + // Keep Sakura's explicit HTTPS ports; the SDK's legacy discovery replaces them. + platform.client.dapiAddressListProvider = configuredAddresses + } } override fun getIdentity(userId: Identifier): Identity? = diff --git a/wallet/src/de/schildbach/wallet/ui/more/AboutViewModel.kt b/wallet/src/de/schildbach/wallet/ui/more/AboutViewModel.kt index 80318a1f87..92d40bd1f1 100644 --- a/wallet/src/de/schildbach/wallet/ui/more/AboutViewModel.kt +++ b/wallet/src/de/schildbach/wallet/ui/more/AboutViewModel.kt @@ -19,6 +19,8 @@ package de.schildbach.wallet.ui.more import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.google.firebase.FirebaseApp +import de.schildbach.wallet_test.BuildConfig import com.google.firebase.installations.FirebaseInstallations import com.google.firebase.messaging.FirebaseMessaging import dagger.hilt.android.lifecycle.HiltViewModel @@ -128,6 +130,7 @@ class AboutViewModel @Inject constructor( } private fun loadFirebaseIds() { + if (BuildConfig.DEBUG && FirebaseApp.getApps(walletApplication).isEmpty()) return FirebaseInstallations.getInstance().id.addOnCompleteListener { task -> val id = if (task.isSuccessful) task.result ?: "" else "" _uiState.update { it.copy(firebaseInstallationId = id) } diff --git a/wallet/standard/src/de/schildbach/wallet/service/platform/NetworkPlatform.kt b/wallet/standard/src/de/schildbach/wallet/service/platform/NetworkPlatform.kt new file mode 100644 index 0000000000..6af3831f60 --- /dev/null +++ b/wallet/standard/src/de/schildbach/wallet/service/platform/NetworkPlatform.kt @@ -0,0 +1,6 @@ +package de.schildbach.wallet.service.platform + +import org.bitcoinj.core.NetworkParameters +import org.dashj.platform.sdk.platform.Platform + +internal fun createNetworkPlatform(params: NetworkParameters): Platform = Platform(params) diff --git a/wallet/test/de/schildbach/wallet/network/SakuraDevNetParamsTest.java b/wallet/test/de/schildbach/wallet/network/SakuraDevNetParamsTest.java new file mode 100644 index 0000000000..1d628c6a66 --- /dev/null +++ b/wallet/test/de/schildbach/wallet/network/SakuraDevNetParamsTest.java @@ -0,0 +1,50 @@ +package de.schildbach.wallet.network; + +import org.bitcoinj.core.Address; +import org.bitcoinj.core.NetworkParameters; +import org.bitcoinj.params.DevNetParams; +import org.bitcoinj.params.TestNet3Params; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class SakuraDevNetParamsTest { + // A synthetic public address for constructor tests, not Sakura's signing key. + private String testAddress() { + return Address.fromPubKeyHash(TestNet3Params.get(), new byte[20]).toBase58(); + } + + @Test + public void usesSakuraIdentityAndRegistersParameters() { + SakuraDevNetParams params = SakuraDevNetParams.create(testAddress(), 20001); + assertEquals("devnet-sakura", params.getDevNetName()); + assertEquals(20001, params.getPort()); + assertEquals(70240, params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT)); + assertSame(params, DevNetParams.get("sakura")); + assertEquals(13, params.getDefaultMasternodeList().length); + assertArrayEquals(params.getDefaultMasternodeList(), params.getDefaultHPMasternodeList()); + } + + @Test + public void peersAreDefensivelyCopiedAndPortCanBeOverridden() { + SakuraDevNetParams params = SakuraDevNetParams.create(testAddress(), 20002); + params.getDefaultMasternodeList()[0] = "127.0.0.1"; + assertEquals("68.67.122.86", params.getDefaultMasternodeList()[0]); + assertEquals(20002, params.getPort()); + } + + @Test(expected = IllegalArgumentException.class) + public void rejectsMissingSporkAddress() { + SakuraDevNetParams.create("", 20001); + } + + @Test(expected = IllegalArgumentException.class) + public void rejectsInvalidPort() { + SakuraDevNetParams.create(testAddress(), 65536); + } + + @Test(expected = IllegalArgumentException.class) + public void rejectsInvalidSporkAddress() { + SakuraDevNetParams.create("not-an-address", 20001); + } +}