Compare commits
2 Commits
a95172ad76
...
eae133f650
Author | SHA1 | Date |
---|---|---|
Honza Rychnovský | eae133f650 | |
Honza Rychnovský | b0ccdef6e3 |
|
@ -9,6 +9,11 @@ directly impact users rather than highlighting other key architectural updates.*
|
|||
|
||||
## [Unreleased]
|
||||
|
||||
## [1.0 (638)] - 2024-04-26
|
||||
|
||||
### Fixed
|
||||
- Default server selection option
|
||||
|
||||
## [1.0 (636)] - 2024-04-26
|
||||
|
||||
### Changed
|
||||
|
|
|
@ -1,29 +1,18 @@
|
|||
@file:Suppress("ktlint:standard:filename")
|
||||
@file:Suppress("ktlint:standard:filename", "MagicNumber")
|
||||
|
||||
package cash.z.ecc.sdk.extension
|
||||
|
||||
import cash.z.ecc.android.sdk.model.ZcashNetwork
|
||||
import co.electriccoin.lightwallet.client.model.LightWalletEndpoint
|
||||
|
||||
/*
|
||||
* This set of extension functions suit for default values for the SDK initialization.
|
||||
* Used for testing purposes only
|
||||
*/
|
||||
|
||||
fun LightWalletEndpoint.Companion.defaultForNetwork(zcashNetwork: ZcashNetwork): LightWalletEndpoint {
|
||||
return when (zcashNetwork.id) {
|
||||
ZcashNetwork.Mainnet.id -> LightWalletEndpoint.Mainnet
|
||||
ZcashNetwork.Testnet.id -> LightWalletEndpoint.Testnet
|
||||
else -> error("Unknown network id: ${zcashNetwork.id}")
|
||||
}
|
||||
}
|
||||
|
||||
private const val DEFAULT_PORT = 9067
|
||||
|
||||
val LightWalletEndpoint.Companion.Mainnet
|
||||
get() =
|
||||
LightWalletEndpoint(
|
||||
"mainnet.lightwalletd.com",
|
||||
DEFAULT_PORT,
|
||||
"zec.rocks",
|
||||
443,
|
||||
isSecure = true
|
||||
)
|
||||
|
||||
|
@ -31,7 +20,7 @@ val LightWalletEndpoint.Companion.Testnet
|
|||
get() =
|
||||
LightWalletEndpoint(
|
||||
"lightwalletd.testnet.electriccoin.co",
|
||||
DEFAULT_PORT,
|
||||
9067,
|
||||
isSecure = true
|
||||
)
|
||||
|
||||
|
|
|
@ -13,15 +13,14 @@ import cash.z.ecc.android.sdk.model.BlockHeight
|
|||
import cash.z.ecc.android.sdk.model.PersistableWallet
|
||||
import cash.z.ecc.android.sdk.model.SeedPhrase
|
||||
import cash.z.ecc.android.sdk.model.ZcashNetwork
|
||||
import cash.z.ecc.sdk.extension.defaultForNetwork
|
||||
import cash.z.ecc.sdk.type.fromResources
|
||||
import co.electriccoin.lightwallet.client.model.LightWalletEndpoint
|
||||
import co.electriccoin.zcash.spackle.FirebaseTestLabUtil
|
||||
import co.electriccoin.zcash.ui.MainActivity
|
||||
import co.electriccoin.zcash.ui.common.model.OnboardingState
|
||||
import co.electriccoin.zcash.ui.common.model.VersionInfo
|
||||
import co.electriccoin.zcash.ui.common.model.WalletRestoringState
|
||||
import co.electriccoin.zcash.ui.common.viewmodel.WalletViewModel
|
||||
import co.electriccoin.zcash.ui.screen.chooseserver.AvailableServerProvider
|
||||
import co.electriccoin.zcash.ui.screen.onboarding.view.ShortOnboarding
|
||||
import co.electriccoin.zcash.ui.screen.onboarding.viewmodel.OnboardingViewModel
|
||||
import co.electriccoin.zcash.ui.screen.restore.WrapRestore
|
||||
|
@ -113,7 +112,7 @@ internal fun persistExistingWalletWithSeedPhrase(
|
|||
PersistableWallet(
|
||||
network = network,
|
||||
birthday = birthday,
|
||||
endpoint = LightWalletEndpoint.defaultForNetwork(network),
|
||||
endpoint = AvailableServerProvider.getDefaultServer(network),
|
||||
seedPhrase = seedPhrase,
|
||||
walletInitMode = WalletInitMode.RestoreWallet
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue