Skip to content

Commit f46739b

Browse files
zcash sdk version bump to 2.2.6 (#70)
1 parent 71ba2aa commit f46739b

File tree

7 files changed

+6
-10
lines changed

7 files changed

+6
-10
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ KOTLINX_SERIALIZABLE_JSON_VERSION=1.6.3
162162
KOVER_VERSION=0.7.3
163163
ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0
164164
ZCASH_BIP39_VERSION=1.0.7
165-
ZCASH_SDK_VERSION=2.2.3
165+
ZCASH_SDK_VERSION=2.2.6
166166
ZXING_VERSION=3.5.2
167167
PDF_BOX_VERSION=2.0.27.0
168168
LOTTIE_VERSION=6.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ object PersistableWalletFixture {
1313
val NETWORK = ZcashNetwork.Mainnet
1414

1515
@Suppress("MagicNumber")
16-
val BIRTHDAY = BlockHeight.new(ZcashNetwork.Mainnet, 626603L)
16+
val BIRTHDAY = BlockHeight.new(626603L)
1717

1818
val SEED_PHRASE = SeedPhraseFixture.new()
1919

ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/migration/viewmodel/AppMigrationViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class AppMigrationViewModel(private val context: Application) : AndroidViewModel
4040
val birthdayHeight = oldSecurePreference.getLong(BIRTHDAY_HEIGHT)
4141
val seedPhraseString = oldSecurePreference.getString(SEED_PHRASE)
4242
val network = ZcashNetwork.fromResources(context)
43-
val birthday = birthdayHeight?.let { BlockHeight.new(network, birthdayHeight) }
43+
val birthday = birthdayHeight?.let { BlockHeight.new(birthdayHeight) }
4444
val seedPhrase = SeedPhrase.new(seedPhraseString)
4545
val oldPin = oldSecurePreference.getString(PIN_CODE).removeSurrounding("[", "]")
4646
.replace(",", "").replace(" ", "")

ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/nighthawk/view/Restore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ internal fun RestoreWallet(activity: ComponentActivity) {
8888
applicationContext,
8989
walletViewModel,
9090
SeedPhrase.new(seedPhrase),
91-
birthdayHeight?.let { BlockHeight.new(network, it) },
91+
birthdayHeight?.let { BlockHeight.new(it) },
9292
WalletInitMode.RestoreWallet,
9393
LightWalletEndpoint.defaultForNetwork(network)
9494
)

ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ private fun RestoreBirthday(
579579

580580
PrimaryButton(
581581
onClick = {
582-
setRestoreHeight(BlockHeight.new(zcashNetwork, height.toLong()))
582+
setRestoreHeight(BlockHeight.new(height.toLong()))
583583
onNext()
584584
},
585585
text = stringResource(R.string.restore_birthday_button_restore),

ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/viewmodel/RestoreViewModel.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import androidx.lifecycle.viewModelScope
77
import cash.z.ecc.android.bip39.Mnemonics
88
import cash.z.ecc.android.sdk.ext.collectWith
99
import cash.z.ecc.android.sdk.model.BlockHeight
10-
import cash.z.ecc.android.sdk.model.ZcashNetwork
11-
import cash.z.ecc.sdk.type.fromResources
1210
import co.electriccoin.zcash.ui.common.ANDROID_STATE_FLOW_TIMEOUT
1311
import co.electriccoin.zcash.ui.screen.restore.model.RestoreStage
1412
import co.electriccoin.zcash.ui.screen.restore.state.RestoreState
@@ -73,7 +71,7 @@ class RestoreViewModel(application: Application, savedStateHandle: SavedStateHan
7371

7472
val userBirthdayHeight: MutableStateFlow<BlockHeight?> = run {
7573
val initialValue: BlockHeight? = savedStateHandle.get<Long>(KEY_BIRTHDAY_HEIGHT)?.let {
76-
BlockHeight.new(ZcashNetwork.fromResources(application), it)
74+
BlockHeight.new(it)
7775
}
7876
MutableStateFlow(initialValue)
7977
}

ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/transactiondetails/view/TransactionDetails.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ fun TransactionDetailsPreview() {
7676
transactionRecipient = TransactionRecipient.Address("jhasdgjhagsdjagsjadjhgasjhdgajshdgjahsgdjasgdjasgdjsad"),
7777
network = ZcashNetwork.Mainnet,
7878
networkHeight = BlockHeight.new(
79-
zcashNetwork = ZcashNetwork.Mainnet,
8079
blockHeight = ZcashNetwork.Mainnet.saplingActivationHeight.value + 10
8180
)
8281
)
@@ -101,7 +100,6 @@ fun TransactionDetailsDarkPreview() {
101100
transactionRecipient = TransactionRecipient.Address("jhasdgjhagsdjagsjadjhgasjhdgajshdgjahsgdjasgdjasgdjsad"),
102101
network = ZcashNetwork.Mainnet,
103102
networkHeight = BlockHeight.new(
104-
zcashNetwork = ZcashNetwork.Mainnet,
105103
blockHeight = ZcashNetwork.Mainnet.saplingActivationHeight.value + 10
106104
)
107105
)

0 commit comments

Comments
 (0)