zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#556] Adopt SDK 1.9 ZcashNetwork API

This commit is contained in:
Carter Jernigan 2022-08-04 11:56:50 -04:00 committed by GitHub
parent f9afd2e5f9
commit a48b18e1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -132,7 +132,7 @@ PLAY_CORE_KTX_VERSION=1.8.1
ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0 ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0
ZCASH_BIP39_VERSION=1.0.2 ZCASH_BIP39_VERSION=1.0.2
# TODO [#279]: Revert to stable SDK before app release # TODO [#279]: Revert to stable SDK before app release
ZCASH_SDK_VERSION=1.8.0-beta01-SNAPSHOT ZCASH_SDK_VERSION=1.9.0-beta01-SNAPSHOT
ZXING_VERSION=3.5.0 ZXING_VERSION=3.5.0

2
sdk-ext-lib/src/androidTest/java/cash/z/ecc/sdk/model/PersistableWalletTest.kt
View File

@ -1,7 +1,7 @@
package cash.z.ecc.sdk.model package cash.z.ecc.sdk.model
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.sdk.fixture.PersistableWalletFixture import cash.z.ecc.sdk.fixture.PersistableWalletFixture
import cash.z.ecc.sdk.fixture.SeedPhraseFixture import cash.z.ecc.sdk.fixture.SeedPhraseFixture
import cash.z.ecc.sdk.test.count import cash.z.ecc.sdk.test.count

2
sdk-ext-lib/src/androidTest/java/cash/z/ecc/sdk/type/ZcashNetworkTest.kt
View File

@ -2,7 +2,7 @@ package cash.z.ecc.sdk.type
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.model.ZcashNetwork
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Test import org.junit.Test

2
sdk-ext-lib/src/main/java/cash/z/ecc/sdk/fixture/PersistableWalletFixture.kt
View File

@ -1,7 +1,7 @@
package cash.z.ecc.sdk.fixture package cash.z.ecc.sdk.fixture
import cash.z.ecc.android.sdk.model.BlockHeight import cash.z.ecc.android.sdk.model.BlockHeight
import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.sdk.model.PersistableWallet import cash.z.ecc.sdk.model.PersistableWallet
import cash.z.ecc.sdk.model.SeedPhrase import cash.z.ecc.sdk.model.SeedPhrase

2
sdk-ext-lib/src/main/java/cash/z/ecc/sdk/model/PersistableWallet.kt
View File

@ -4,7 +4,7 @@ import android.app.Application
import cash.z.ecc.android.bip39.Mnemonics import cash.z.ecc.android.bip39.Mnemonics
import cash.z.ecc.android.bip39.toEntropy import cash.z.ecc.android.bip39.toEntropy
import cash.z.ecc.android.sdk.model.BlockHeight import cash.z.ecc.android.sdk.model.BlockHeight
import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.sdk.type.fromResources import cash.z.ecc.sdk.type.fromResources
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext

2
sdk-ext-lib/src/main/java/cash/z/ecc/sdk/type/ZcashNetwork.kt
View File

@ -3,7 +3,7 @@
package cash.z.ecc.sdk.type package cash.z.ecc.sdk.type
import android.content.Context import android.content.Context
import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.sdk.ext.R import cash.z.ecc.sdk.ext.R
/* /*

6
ui-lib/src/main/java/co/electriccoin/zcash/global/WalletCoordinator.kt
View File

@ -6,9 +6,11 @@ import cash.z.ecc.android.bip39.toSeed
import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.Initializer
import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.Synchronizer
import cash.z.ecc.android.sdk.ext.onFirst import cash.z.ecc.android.sdk.ext.onFirst
import cash.z.ecc.android.sdk.model.LightWalletEndpoint
import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.android.sdk.model.defaultForNetwork
import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.tool.DerivationTool
import cash.z.ecc.android.sdk.type.UnifiedViewingKey import cash.z.ecc.android.sdk.type.UnifiedViewingKey
import cash.z.ecc.android.sdk.type.ZcashNetwork
import cash.z.ecc.sdk.model.PersistableWallet import cash.z.ecc.sdk.model.PersistableWallet
import cash.z.ecc.sdk.type.fromResources import cash.z.ecc.sdk.type.fromResources
import co.electriccoin.zcash.spackle.LazyWithArgument import co.electriccoin.zcash.spackle.LazyWithArgument
@ -237,6 +239,6 @@ private suspend fun PersistableWallet.toConfig(): Initializer.Config {
val vk = deriveViewingKey() val vk = deriveViewingKey()
return Initializer.Config { return Initializer.Config {
it.importWallet(vk, birthday, network, network.defaultHost, network.defaultPort) it.importWallet(vk, birthday, network, LightWalletEndpoint.defaultForNetwork(network))
} }
} }

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt
View File

@ -9,7 +9,7 @@ import androidx.activity.viewModels
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.sdk.fixture.SeedPhraseFixture import cash.z.ecc.sdk.fixture.SeedPhraseFixture
import cash.z.ecc.sdk.model.PersistableWallet import cash.z.ecc.sdk.model.PersistableWallet
import cash.z.ecc.sdk.model.SeedPhrase import cash.z.ecc.sdk.model.SeedPhrase