Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d2cd61f
refactor(compose): extract a shared AmountEntryPage and move the DEX …
HashEngineering Nov 4, 2026
fb335a0
feat(payments): External Send from any balance in Advanced mode (MO-1…
HashEngineering Nov 5, 2026
da452f7
fix(payments): address pre-review round 1 on External Send
HashEngineering Nov 5, 2026
4a57407
fix(payments): address pre-review round 2 on External Send
HashEngineering Nov 5, 2026
e6d9ca2
fix(payments): keep the External Send form disabled once a send has f…
HashEngineering Nov 5, 2026
6921674
feat(payments): enable External Send from Core to a third-party Platf…
HashEngineering Nov 6, 2026
3f16457
feat(payments): resume an interrupted Core → Platform send at app start
HashEngineering Nov 6, 2026
e1d7ba4
feat(platform): start the SDK's Platform-address balance sync
HashEngineering Nov 6, 2026
5610dfc
fix(payments): return Home after a finished External Send
HashEngineering Nov 7, 2026
3406fe7
fix(history): show a Core → Platform send as a send titled "Platform"
HashEngineering Nov 7, 2026
f0a3bee
feat(payments): enable Platform → Core and third-party shields in Ext…
HashEngineering Nov 9, 2026
c02d86c
fix(history): label a received withdrawal "Withdrawal"
HashEngineering Nov 9, 2026
09841a9
fix(payments): make Max follow a source change in External Send
HashEngineering Nov 9, 2026
16b2246
Merge branch 'feat/advanced-payments-screen' into feat/shared-amount-…
HashEngineering Nov 10, 2026
e701af0
Merge branch 'feat/shared-amount-entry-page' into feat/advanced-exter…
HashEngineering Nov 10, 2026
1201fd1
Merge branch 'feat/shared-amount-entry-page' into feat/advanced-exter…
HashEngineering Nov 10, 2026
c411711
Merge branch 'feat/shared-amount-entry-page' into feat/advanced-exter…
HashEngineering Nov 10, 2026
5b5a77e
refactor(payments): simplify External Send's fee, Max and read plumbing
HashEngineering Nov 10, 2026
7aad25f
fix(payments): draw the External Send result inside the screen
HashEngineering Nov 10, 2026
45c60f2
feat(payments): open the transaction result after a Core-sourced Exte…
HashEngineering Nov 10, 2026
296d75d
Merge commit '7aad25f1f' into simplify/pr1680
HashEngineering Nov 10, 2026
153052d
Merge commit '45c60f2dd' into simplify/pr1680
HashEngineering Nov 10, 2026
9a51adc
fix(payments): restore the External Send From/To card colours
HashEngineering Nov 11, 2026
6aecbae
fix(payments): clear a Core -> Platform funding Platform already has
HashEngineering Nov 11, 2026
0ab3c40
Merge branch 'feat/shared-amount-entry-page' into claude/advanced-ext…
HashEngineering Nov 11, 2026
2fccaa6
fix(payments): pay the confirmed amount on External Send withdrawals
HashEngineering Nov 11, 2026
4440881
fix(history): show a Core -> third-party Shielded payment as a send
HashEngineering Nov 11, 2026
7c232ff
fix(payments): hold the wallet-wipe barrier on External Send submissions
HashEngineering Nov 11, 2026
e7bda1e
build: pin the Dash SDK to 5.1.0-int38
HashEngineering Nov 12, 2026
91ff74a
fix(payments): handle int38's unconfirmed outcomes and unproven consu…
HashEngineering Nov 12, 2026
d4a6e58
fix(payments): limit Platform -> Identity to own identity; keep SDK m…
HashEngineering Nov 13, 2026
378630b
feat(payments): pin the Dash SDK to 5.1.0-int39; Platform -> any iden…
HashEngineering Nov 13, 2026
d7c2f68
fix(payments): cap Platform -> Core at what the withdrawal can take
HashEngineering Nov 13, 2026
9d5fc46
fix(payments): match the External Send confirm notes to Figma
HashEngineering Nov 13, 2026
652dbee
fix(payments): keep a fee reserve on Platform -> Identity top-ups
HashEngineering Nov 13, 2026
ddbf90a
fix(payments): address pre-review findings on External Send
HashEngineering Nov 13, 2026
7f20994
feat(payments): estimate the Core -> Identity network fee
HashEngineering Nov 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,21 @@ buildscript {
// truth for both the dependency coordinate (wallet/build.gradle) and the
// DASH_SDK_VERSION BuildConfig field shown on the About screen once the
// cutover hands L1 ownership to the SDK.
// Recipe: HashEngineering/dash-wallet-qa
// recipes/platform/5.1.0-int36.yaml.
dashSdkVersion = '5.1.0-int36-20261106.165805-1'
// Pre-release SDK snapshot published to the Sonatype snapshots repository
// (declared below as 'Central Portal Snapshots'; anonymous read). Pinned to
// the exact timestamped build, not the -SNAPSHOT name, so a later upload
// can't change what this commit builds. 5.1.0-int39 = int38 plus a Kotlin binding of
// #5860 (IdentityCredits.topUpExternalIdentityFromAddresses: top up an identity the
// wallet does not manage from its Platform addresses). int38: HashEngineering/platform
// integration/5.1.0-int38 @ c45221249f = int37's bindings (the partial-amount
// Platform-address withdrawal #5830, the third-party shields shieldedShieldToRecipient
// and shieldedShieldFromIdentityToRecipient) on v5.1-dev up to 185d0e6924, which adds
// #5556 (an uncertain submission outcome survives the shared broadcast as the typed
// DashSdkError.StateTransitionResultUnconfirmed), #5823 (prove a state transition's
// outcome; getRecentStateTransitionStatus), #5762 (persist the Orchard recipient of a
// shielded asset-lock funding), the Rust-owned TXO reconcile engine and DashPay private
// contact requests (#5809/#5810/#5813).
dashSdkVersion = '5.1.0-int39-20261113.161202-1'
// Legacy dashj-platform SDK (org.dashj.platform), master's pin. It replaces the
// 5.0.0-20261016.200955-3 snapshot this branch pinned for document serialization
// format 3 (Platform protocol 14) and the IdentityPublicKey.toObject() CBOR fix;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ object AddressUtils {
@Throws(AddressFormatException::class)
fun decode(address: String): DecodedAddress {
val versionAndDataBytes = Base58.decodeChecked(address)
// A valid checksum over an EMPTY payload (e.g. "3QJmnh") has no version byte.
if (versionAndDataBytes.isEmpty()) {
throw AddressFormatException.InvalidDataLength("Legacy addresses need a version byte, but got 0 bytes")
}
val version = versionAndDataBytes[0].toInt() and 0xFF
val payload = versionAndDataBytes.copyOfRange(1, versionAndDataBytes.size)
if (payload.size != 20) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ class WifKey private constructor(
override fun toString(): String = toBase58()

companion object {
/** [Base58.decodeChecked], refusing a checksum-valid EMPTY payload (no version byte). */
private fun decodeCheckedWithVersion(wif: String): ByteArray {
val versionAndDataBytes = Base58.decodeChecked(wif)
if (versionAndDataBytes.isEmpty()) {
throw AddressFormatException.InvalidDataLength("WIF keys need a version byte, but got 0 bytes")
}
return versionAndDataBytes
}

/**
* Decodes a WIF string without any network check (checksum still enforced).
*
Expand All @@ -70,7 +79,7 @@ class WifKey private constructor(
@JvmStatic
@Throws(AddressFormatException::class)
fun decode(wif: String): WifKey {
val versionAndDataBytes = Base58.decodeChecked(wif)
val versionAndDataBytes = decodeCheckedWithVersion(wif)
val version = versionAndDataBytes[0].toInt() and 0xFF
val bytes = versionAndDataBytes.copyOfRange(1, versionAndDataBytes.size)
return WifKey(version, bytes)
Expand All @@ -89,7 +98,7 @@ class WifKey private constructor(
@JvmStatic
@Throws(AddressFormatException::class)
fun decode(wif: String, network: AddressNetwork): WifKey {
val versionAndDataBytes = Base58.decodeChecked(wif)
val versionAndDataBytes = decodeCheckedWithVersion(wif)
val version = versionAndDataBytes[0].toInt() and 0xFF
if (version != network.dumpedPrivateKeyHeader) {
throw AddressFormatException.WrongNetwork(version)
Expand All @@ -112,7 +121,7 @@ class WifKey private constructor(
@JvmStatic
@Throws(AddressFormatException::class)
fun decodeDash(wif: String): Pair<WifKey, AddressNetwork> {
val versionAndDataBytes = Base58.decodeChecked(wif)
val versionAndDataBytes = decodeCheckedWithVersion(wif)
val version = versionAndDataBytes[0].toInt() and 0xFF
for (network in listOf(AddressNetwork.DASH_TESTNET, AddressNetwork.DASH_MAINNET)) {
if (version == network.dumpedPrivateKeyHeader) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,11 @@ class AddressParserTest {
).size
)
}

@Test
fun checksumValidEmptyPayload_isAFormatError_notACrash() {
// "3QJmnh" is the Base58Check encoding of ZERO bytes: a valid checksum, no version byte.
org.junit.Assert.assertThrows(AddressFormatException::class.java) { AddressUtils.decode("3QJmnh") }
assertFalse(AddressUtils.isValid(AddressNetwork.DASH_MAINNET, "3QJmnh"))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,13 @@ class WifKeyTest {
WifKey.encode(AddressNetwork.DASH_MAINNET, ByteArray(33), false)
}
}

@Test
fun checksumValidEmptyPayload_isAFormatError_notACrash() {
// "3QJmnh" is the Base58Check encoding of ZERO bytes: a valid checksum, no version byte.
assertEquals(0, Base58.decodeChecked("3QJmnh").size)
assertThrows(AddressFormatException::class.java) { WifKey.decode("3QJmnh") }
assertThrows(AddressFormatException::class.java) { WifKey.decode("3QJmnh", AddressNetwork.DASH_MAINNET) }
assertThrows(AddressFormatException::class.java) { WifKey.decodeDash("3QJmnh") }
}
}
27 changes: 27 additions & 0 deletions wallet/res/drawable/ic_system_message_info.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2026 Dash Core Group.
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<!-- Figma icon "info-rect-small" (4030:49111): 30x30, the glyph 20x20 in the middle. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="30dp"
android:viewportWidth="30"
android:viewportHeight="30">
<path
android:fillColor="#008DE4"
android:pathData="M15,5C7.71,5 5,7.71 5,15C5,22.29 7.71,25 15,25C22.29,25 25,22.29 25,15C25,7.71 22.29,5 15,5ZM14,14.8C14,14.25 14.45,13.8 15,13.8C15.55,13.8 16,14.25 16,14.8V18.71C16,19.27 15.55,19.71 15,19.71C14.45,19.71 14,19.27 14,18.71V14.8ZM15.92,11.66C15.87,11.78 15.8,11.89 15.71,11.99C15.52,12.17 15.27,12.28 15,12.28C14.87,12.28 14.74,12.25 14.62,12.2C14.5,12.15 14.39,12.08 14.29,11.99C14.2,11.89 14.13,11.78 14.08,11.66C14.03,11.54 14,11.41 14,11.28C14,11.01 14.11,10.76 14.29,10.57C14.39,10.48 14.5,10.4 14.62,10.35C14.98,10.2 15.42,10.29 15.71,10.57C15.9,10.76 16,11.01 16,11.28C16,11.41 15.97,11.54 15.92,11.66Z" />
</vector>
30 changes: 30 additions & 0 deletions wallet/res/drawable/ic_system_message_public.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2026 Dash Core Group.
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<!-- Figma icon "system_message-public" (7107:48407): a 22x18.333 eye, centred in the 30dp slot. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="18.3333dp"
android:viewportWidth="22"
android:viewportHeight="18.3333">
<path
android:fillColor="#008DE4"
android:pathData="M11,6.41667C9.4875,6.41667 8.25,7.65417 8.25,9.16667C8.25,10.6792 9.4875,11.9167 11,11.9167C12.5125,11.9167 13.75,10.6792 13.75,9.16667C13.75,7.65417 12.5125,6.41667 11,6.41667Z" />
<path
android:fillColor="#008DE4"
android:pathData="M11,13.75C8.47,13.75 6.41667,11.6967 6.41667,9.16667C6.41667,6.63667 8.47,4.58333 11,4.58333C13.53,4.58333 15.5833,6.63667 15.5833,9.16667C15.5833,11.6967 13.53,13.75 11,13.75ZM11,0C5.5,0 0,4.58333 0,9.16667C0,13.75 5.5,18.3333 11,18.3333C16.5,18.3333 22,13.75 22,9.16667C22,4.58333 16.5,0 11,0Z" />
</vector>
24 changes: 24 additions & 0 deletions wallet/res/navigation/nav_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,30 @@
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/activity_stay"
app:popExitAnim="@anim/slide_out_left" />

<action
android:id="@+id/payments_to_externalSend"
app:destination="@id/externalSendFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/activity_stay"
app:popExitAnim="@anim/slide_out_left" />
</fragment>

<!-- Advanced mode external send (MO-1121); prefill = an already-validated scanned destination. -->
<fragment
android:id="@+id/externalSendFragment"
android:name="de.schildbach.wallet.ui.payments.send.ExternalSendFragment"
android:label="External send">

<argument
android:name="prefill"
android:defaultValue="@null"
app:argType="string"
app:nullable="true" />

<argument
android:name="ShowNavBar"
android:defaultValue="false" />
</fragment>

<fragment
Expand Down
74 changes: 71 additions & 3 deletions wallet/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@
<string name="transaction_row_status_sending">Sending</string>
<string name="transaction_row_status_sent_internally">Internal</string>
<string name="transaction_row_shielded">Shielded</string>
<!-- A Core payment sent to a Dash Platform address (an asset lock funding that address). -->
<string name="transaction_row_platform">Platform</string>
<string name="transaction_row_unshielded">Unshielded</string>
<!-- An AssetUnlock from Platform to this wallet that this wallet's own shielded pool did not
author: a Platform identity credit withdrawal (evonode reward withdrawals included) or a
foreign pool's payout. Shown with receive semantics. -->
<string name="transaction_row_unshielded_withdrawal">Unshielded Withdrawal</string>
author: a Platform address withdrawal, a Platform identity credit withdrawal (evonode
reward withdrawals included) or a foreign pool's unshield. Shown with receive semantics. -->
<string name="transaction_row_withdrawal">Withdrawal</string>
<string name="transaction_row_invitation">Invitation</string>
<string name="transaction_row_status_processing">Processing</string>
<string name="transaction_row_status_confirming">Confirming</string>
Expand Down Expand Up @@ -519,6 +521,72 @@
<string name="receive_copy_username">Copy username</string>
<string name="receive_copy_address">Copy address</string>
<string name="receive_qr_code_description">QR code for the address below</string>
<!-- Advanced mode: Send tab and the external send flow (MO-1121) -->
<string name="advanced_send_to_username">Send to username</string>
<string name="advanced_send_to_address">Send to Dash address</string>
<string name="advanced_send_scan_qr">Scan Dash QR</string>
<string name="advanced_send_invalid_qr">This QR code is not a Dash address or payment request.</string>
<string name="external_send_wrong_network">This address belongs to a different Dash network.</string>
<string name="external_send_invalid_address">This is not a valid Dash address or identity ID.</string>
<string name="external_send_address_title">Address</string>
<string name="external_send_address_label">DASH address</string>
<string name="external_send_address_placeholder">Enter address</string>
<string name="external_send_show_clipboard">Show clipboard</string>
<string name="external_send_clipboard_hint">Tap the address from the clipboard to paste it</string>
<string name="external_send_clipboard_empty">There is no Dash address in the clipboard</string>
<string name="external_send_clipboard_entry_description">Paste %1$s</string>
<string name="external_send_scan_description">Scan a QR code</string>
<string name="external_send_back">Back</string>
<string name="external_send_close">Close</string>
<string name="external_send_title">Send</string>
<string name="external_send_from">From</string>
<string name="external_send_to">To</string>
<string name="external_send_change_source">Change the balance to send from</string>
<string name="external_send_balance_core">Core</string>
<string name="external_send_balance_shielded">Shielded</string>
<string name="external_send_balance_platform">Platform</string>
<string name="external_send_balance_identity">Identity</string>
<string name="external_send_balance_name_core">Transparent balance</string>
<string name="external_send_balance_name_shielded">Shielded balance</string>
<string name="external_send_balance_name_platform">Platform balance</string>
<string name="external_send_balance_name_identity">Identity balance</string>
<!-- Shown for a balance, fee or total that is not known yet (never shown as 0) -->
<string name="external_send_value_unknown">—</string>
<string name="external_send_select_source">Select source</string>
<string name="external_send_source_unavailable">Not available for this destination yet</string>
<string name="external_send_identity_not_found">No identity with this ID exists</string>
<string name="external_send_identity_unknown">Could not check this identity. Check your connection and try again.</string>
<string name="external_send_identity_checking">Checking the identity…</string>
<string name="external_send_confirm_title">Confirm</string>
<string name="external_send_network_fee">Network fee</string>
<string name="external_send_total">Total</string>
<!-- %1$s: an amount; an estimate rather than the exact figure -->
<string name="external_send_approximately">~%1$s</string>
<string name="external_send_shielded_not_instant">When sending from Shielded balance, the transaction is not instant and takes some time</string>
<string name="external_send_shielded_public_to_core">When sending from Shielded balance to Core the amount and destination becomes public</string>
<string name="external_send_shielded_public_to_platform">When sending from Shielded balance to Platform the amount and destination becomes public</string>
<string name="external_send_shielded_public_to_identity">When sending from Shielded balance to an identity the amount and destination becomes public</string>
<string name="external_send_sending_title">Sending…</string>
<string name="external_send_sending_shielded_message">This could take about 30 seconds. You can leave this screen; the payment will continue.</string>
<string name="external_send_sending_message">This will only take a moment.</string>
<string name="external_send_sent_title">Sent</string>
<string name="external_send_sent_message">Your payment was sent.</string>
<string name="external_send_not_sent_title">Not sent</string>
<string name="external_send_edit">Edit</string>
<string name="external_send_not_sent_insufficient_funds">The balance is not enough for this amount and its fee. Nothing was sent.</string>
<string name="external_send_not_sent_not_synced">Your wallet is still syncing. Nothing was sent; try again once it has finished.</string>
<string name="external_send_not_sent_signer_locked">The payment could not be signed. Unlock your device and try again. Nothing was sent.</string>
<string name="external_send_not_sent_not_supported">This kind of payment is not available yet. Nothing was sent.</string>
<string name="external_send_not_sent_still_confirming">An earlier payment is still confirming. Nothing was sent; try again once it has confirmed.</string>
<string name="external_send_not_sent_in_progress">Another payment is still being sent. Nothing was sent; try again once it has finished.</string>
<string name="external_send_not_sent_generic">The payment could not be sent. Nothing was sent.</string>
<string name="external_send_ambiguous_title">Payment status unknown</string>
<string name="external_send_not_sent_balance_changed">Your balance changed after you confirmed. Nothing was sent; review the amount and try again.</string>
<string name="external_send_not_sent_earlier_top_up_completed">An earlier, unfinished top-up of this identity was completed instead. This payment was not sent; try again to send it.</string>
<string name="external_send_ambiguous_after_restart_message">The app was closed while a payment was being sent. It may have gone through: check your history before sending again.</string>
<string name="external_send_ambiguous_message">Your payment may have gone through. Do not send it again; your balances will update after the next sync.</string>
<string name="external_send_interrupted_title">Payment not completed</string>
<string name="external_send_interrupted_message">The payment could not be completed. The funds will arrive in your Shielded balance instead; the recipient was not paid.</string>
<string name="receive_address_unavailable">This address is not available right now</string>
<string name="dash_connect_revoke_access">Revoke access</string>
</resources>
7 changes: 7 additions & 0 deletions wallet/src/de/schildbach/wallet/di/PlatformSdkModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import de.schildbach.wallet.service.platform.sdk.DashPayBackfillGateImpl
import de.schildbach.wallet.service.platform.sdk.DashSdkMessageSigner
import de.schildbach.wallet.service.platform.sdk.DashSdkService
import de.schildbach.wallet.service.platform.sdk.DashSdkServiceImpl
import de.schildbach.wallet.service.platform.sdk.ExternalSendService
import de.schildbach.wallet.service.platform.sdk.ExternalSendServiceImpl
import de.schildbach.wallet.service.platform.sdk.PlatformMnemonicProvider
import de.schildbach.wallet.service.platform.sdk.SdkMessageSigner
import de.schildbach.wallet.service.platform.sdk.SecurityGuardMnemonicProvider
Expand Down Expand Up @@ -76,6 +78,11 @@ abstract class PlatformSdkModule {
service: ShieldedBalanceServiceImpl
): ShieldedBalanceService

/** Advanced-mode External Send (MO-1121): orchestration over the sibling send services. */
@Singleton
@Binds
abstract fun bindExternalSendService(service: ExternalSendServiceImpl): ExternalSendService

/**
* The SDK message-signing seam behind
* [de.schildbach.wallet.security.SecurityFunctions.signMessage] (the
Expand Down
Loading
Loading