Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions packages/rs-platform-wallet-ffi/src/persistence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1927,7 +1927,15 @@ fn build_core_address_entry_ffi(
// PlatformAddress conversion fails (only P2PKH / P2SH supported)
// fall back to base58check so the address still surfaces.
let rendered_address = if is_platform_payment {
let network = *info.address.network();
let network = if info
.address
.as_unchecked()
.is_valid_for_network(Network::Mainnet)
{
Network::Mainnet
} else {
Network::Testnet
};
let converted: Result<PlatformAddress, _> = PlatformAddress::try_from(info.address.clone());
converted
.map(|p| p.to_bech32m_string(network))
Expand Down Expand Up @@ -2121,7 +2129,15 @@ fn build_address_pools_from_derived(
// bech32m; everything else base58check (matching
// `build_core_address_entry_ffi`'s logic).
let rendered_address = if is_platform_payment {
let network = *d.address.network();
let network = if d
.address
.as_unchecked()
.is_valid_for_network(Network::Mainnet)
{
Network::Mainnet
} else {
Network::Testnet
};
let converted: Result<PlatformAddress, _> =
PlatformAddress::try_from(d.address.clone());
converted
Expand Down
13 changes: 9 additions & 4 deletions packages/rs-platform-wallet/src/address_paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,15 @@ use crate::DerivedAddress;
/// Render the BIP32 derivation path for a `DerivedAddress` event
/// payload. See module-level docs for the path layout rules.
pub fn derivation_path_for_derived_address(derived: &DerivedAddress) -> Option<DerivationPath> {
// `dashcore::Address::network()` returns `&Network` and
// `key_wallet::Network` is a re-export of `dashcore::Network`,
// so this is a single deref — no conversion needed.
let network: Network = *derived.address.network();
let network = if derived
.address
.as_unchecked()
.is_valid_for_network(Network::Mainnet)
{
Network::Mainnet
} else {
Network::Testnet
};
let mut path: DerivationPath = derived.account_type.derivation_path(network).ok()?;
let leaf = match derived.pool_type {
AddressPoolType::External => {
Expand Down
2 changes: 1 addition & 1 deletion packages/wasm-sdk/src/wallet/key_generation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ impl WasmSdk {
let net: Network = network_wasm.into();

Address::from_str(address)
.map(|addr| *addr.network() == net)
.map(|addr| addr.is_valid_for_network(net))
.unwrap_or(false)
}

Expand Down
Loading