Update to latest SDK and fix errors.
This commit is contained in:
parent
8c93840671
commit
925a5cb4d6
|
@ -8,8 +8,10 @@ import cash.z.wallet.sdk.demoapp.databinding.FragmentGetAddressBinding
|
||||||
|
|
||||||
class GetAddressFragment : BaseDemoFragment<FragmentGetAddressBinding>() {
|
class GetAddressFragment : BaseDemoFragment<FragmentGetAddressBinding>() {
|
||||||
|
|
||||||
private var seed: ByteArray = App.instance.defaultConfig.seed
|
private val config = App.instance.defaultConfig
|
||||||
private val initializer: Initializer = Initializer(App.instance)
|
private var seed: ByteArray = config.seed
|
||||||
|
private val initializer: Initializer = Initializer(App.instance, host = config.host, port = config.port)
|
||||||
|
private val birthday = config.newWalletBirthday()
|
||||||
|
|
||||||
override fun inflateBinding(layoutInflater: LayoutInflater): FragmentGetAddressBinding
|
override fun inflateBinding(layoutInflater: LayoutInflater): FragmentGetAddressBinding
|
||||||
= FragmentGetAddressBinding.inflate(layoutInflater)
|
= FragmentGetAddressBinding.inflate(layoutInflater)
|
||||||
|
@ -19,7 +21,7 @@ class GetAddressFragment : BaseDemoFragment<FragmentGetAddressBinding>() {
|
||||||
* Create and initialize the wallet. Initialization will return the private keys but for the
|
* Create and initialize the wallet. Initialization will return the private keys but for the
|
||||||
* purposes of this demo we don't need them.
|
* purposes of this demo we don't need them.
|
||||||
*/
|
*/
|
||||||
initializer.new(seed)
|
initializer.new(seed, birthday)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResetComplete() {
|
override fun onResetComplete() {
|
||||||
|
|
|
@ -9,6 +9,7 @@ import cash.z.wallet.sdk.demoapp.databinding.FragmentGetPrivateKeyBinding
|
||||||
class GetPrivateKeyFragment : BaseDemoFragment<FragmentGetPrivateKeyBinding>() {
|
class GetPrivateKeyFragment : BaseDemoFragment<FragmentGetPrivateKeyBinding>() {
|
||||||
private var seed: ByteArray = App.instance.defaultConfig.seed
|
private var seed: ByteArray = App.instance.defaultConfig.seed
|
||||||
private val initializer: Initializer = Initializer(App.instance)
|
private val initializer: Initializer = Initializer(App.instance)
|
||||||
|
private val birthday = App.instance.defaultConfig.newWalletBirthday()
|
||||||
private lateinit var spendingKeys: Array<String>
|
private lateinit var spendingKeys: Array<String>
|
||||||
private lateinit var viewingKeys: Array<String>
|
private lateinit var viewingKeys: Array<String>
|
||||||
|
|
||||||
|
@ -22,7 +23,7 @@ class GetPrivateKeyFragment : BaseDemoFragment<FragmentGetPrivateKeyBinding>() {
|
||||||
* store these keys in its secure storage for retrieval, later. Private keys are only needed
|
* store these keys in its secure storage for retrieval, later. Private keys are only needed
|
||||||
* for sending funds.
|
* for sending funds.
|
||||||
*/
|
*/
|
||||||
spendingKeys = initializer.new(seed)
|
spendingKeys = initializer.new(seed, birthday)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Viewing keys can be derived from a seed or from spending keys.
|
* Viewing keys can be derived from a seed or from spending keys.
|
||||||
|
|
|
@ -22,7 +22,8 @@ import kotlinx.coroutines.launch
|
||||||
*/
|
*/
|
||||||
class ListTransactionsFragment : BaseDemoFragment<FragmentListTransactionsBinding>() {
|
class ListTransactionsFragment : BaseDemoFragment<FragmentListTransactionsBinding>() {
|
||||||
private val config = App.instance.defaultConfig
|
private val config = App.instance.defaultConfig
|
||||||
private val initializer = Initializer(App.instance)
|
private val initializer = Initializer(App.instance, host = config.host, port = config.port)
|
||||||
|
private val birthday = config.newWalletBirthday()
|
||||||
private lateinit var synchronizer: Synchronizer
|
private lateinit var synchronizer: Synchronizer
|
||||||
private lateinit var adapter: TransactionAdapter<ConfirmedTransaction>
|
private lateinit var adapter: TransactionAdapter<ConfirmedTransaction>
|
||||||
|
|
||||||
|
@ -30,8 +31,8 @@ class ListTransactionsFragment : BaseDemoFragment<FragmentListTransactionsBindin
|
||||||
FragmentListTransactionsBinding.inflate(layoutInflater)
|
FragmentListTransactionsBinding.inflate(layoutInflater)
|
||||||
|
|
||||||
override fun resetInBackground() {
|
override fun resetInBackground() {
|
||||||
initializer.new(config.seed)
|
initializer.new(config.seed, birthday)
|
||||||
synchronizer = Synchronizer(App.instance, config.host, initializer.rustBackend)
|
synchronizer = Synchronizer(App.instance, initializer)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResetComplete() {
|
override fun onResetComplete() {
|
||||||
|
|
|
@ -17,7 +17,8 @@ import cash.z.wallet.sdk.ext.*
|
||||||
|
|
||||||
class SendFragment : BaseDemoFragment<FragmentSendBinding>() {
|
class SendFragment : BaseDemoFragment<FragmentSendBinding>() {
|
||||||
private val config = App.instance.defaultConfig
|
private val config = App.instance.defaultConfig
|
||||||
private val initializer = Initializer(App.instance)
|
private val initializer = Initializer(App.instance, host = config.host, port = config.port)
|
||||||
|
private val birthday = config.newWalletBirthday()
|
||||||
|
|
||||||
private lateinit var synchronizer: Synchronizer
|
private lateinit var synchronizer: Synchronizer
|
||||||
private lateinit var keyManager: SampleStorageBridge
|
private lateinit var keyManager: SampleStorageBridge
|
||||||
|
@ -56,9 +57,9 @@ class SendFragment : BaseDemoFragment<FragmentSendBinding>() {
|
||||||
FragmentSendBinding.inflate(layoutInflater)
|
FragmentSendBinding.inflate(layoutInflater)
|
||||||
|
|
||||||
override fun resetInBackground() {
|
override fun resetInBackground() {
|
||||||
val spendingKeys = initializer.new(config.seed)
|
val spendingKeys = initializer.new(config.seed, birthday)
|
||||||
keyManager = SampleStorageBridge().securelyStorePrivateKey(spendingKeys[0])
|
keyManager = SampleStorageBridge().securelyStorePrivateKey(spendingKeys[0])
|
||||||
synchronizer = Synchronizer(App.instance, config.host, initializer.rustBackend)
|
synchronizer = Synchronizer(App.instance, initializer)
|
||||||
}
|
}
|
||||||
|
|
||||||
// STARTING POINT
|
// STARTING POINT
|
||||||
|
@ -102,7 +103,7 @@ class SendFragment : BaseDemoFragment<FragmentSendBinding>() {
|
||||||
|
|
||||||
private fun onStatus(status: Synchronizer.Status) {
|
private fun onStatus(status: Synchronizer.Status) {
|
||||||
binding.textStatus.text = "Status: $status"
|
binding.textStatus.text = "Status: $status"
|
||||||
if (status == Synchronizer.Status.SYNCING) {
|
if (status != Synchronizer.Status.SYNCED) {
|
||||||
isSyncing = true
|
isSyncing = true
|
||||||
binding.textBalance.text = "Calculating balance..."
|
binding.textBalance.text = "Calculating balance..."
|
||||||
} else {
|
} else {
|
||||||
|
@ -120,10 +121,10 @@ class SendFragment : BaseDemoFragment<FragmentSendBinding>() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onBalance(balance: CompactBlockProcessor.WalletBalance) {
|
private fun onBalance(balance: CompactBlockProcessor.WalletBalance) {
|
||||||
availableBalance = balance.available
|
availableBalance = balance.availableZatoshi
|
||||||
binding.textBalance.text = """
|
binding.textBalance.text = """
|
||||||
Available balance: ${balance.available.convertZatoshiToZecString()}
|
Available balance: ${balance.availableZatoshi.convertZatoshiToZecString()}
|
||||||
Total balance: ${balance.total.convertZatoshiToZecString()}
|
Total balance: ${balance.totalZatoshi.convertZatoshiToZecString()}
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,19 @@
|
||||||
package cash.z.wallet.sdk.demoapp.util
|
package cash.z.wallet.sdk.demoapp.util
|
||||||
|
|
||||||
|
import cash.z.wallet.sdk.Initializer
|
||||||
|
import cash.z.wallet.sdk.demoapp.App
|
||||||
|
|
||||||
data class DemoConfig(
|
data class DemoConfig(
|
||||||
val host: String = "34.68.177.238",//"192.168.1.134",//
|
val host: String = "34.68.177.238",//"192.168.1.134",//
|
||||||
val port: Int = 9067,
|
val port: Int = 9067,
|
||||||
val birthdayHeight: Int = 620_000,//523_240,
|
val birthdayHeight: Int = 620_000,//523_240,
|
||||||
val network: ZcashNetwork = ZcashNetwork.TEST_NET,
|
val network: ZcashNetwork = ZcashNetwork.TEST_NET,
|
||||||
val seed: ByteArray = "testreferencealice".toByteArray(),
|
val seed: ByteArray = "testreferencealice____placeholder".toByteArray(),
|
||||||
val toAddress: String = "ztestsapling1fg82ar8y8whjfd52l0xcq0w3n7nn7cask2scp9rp27njeurr72ychvud57s9tu90fdqgwdt07lg",
|
val toAddress: String = "ztestsapling1fg82ar8y8whjfd52l0xcq0w3n7nn7cask2scp9rp27njeurr72ychvud57s9tu90fdqgwdt07lg",
|
||||||
val sendAmount: Double = 0.0024
|
val sendAmount: Double = 0.0024
|
||||||
)
|
) {
|
||||||
|
fun newWalletBirthday() = Initializer.DefaultBirthdayStore.loadBirthdayFromAssets(App.instance)
|
||||||
|
fun loadBirthday() = Initializer.DefaultBirthdayStore.loadBirthdayFromAssets(App.instance, birthdayHeight)
|
||||||
|
}
|
||||||
|
|
||||||
enum class ZcashNetwork { MAIN_NET, TEST_NET }
|
enum class ZcashNetwork { MAIN_NET, TEST_NET }
|
|
@ -10,7 +10,7 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.6.0-beta04'
|
classpath 'com.android.tools.build:gradle:3.6.0-rc01'
|
||||||
classpath"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#Mon Sep 30 13:00:06 MDT 2019
|
#Mon Feb 24 12:41:21 EST 2020
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
|
||||||
|
|
Loading…
Reference in New Issue