diff --git a/CHANGELOG.md b/CHANGELOG.md index cb79d96f..b51757da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ Change Log ========== +Upcoming +------------------------------------ +- Repackaged internal classes to a new `internal` package name + Version 1.3.0-beta18 *(2021-08-10)* ------------------------------------ - Fix: Corrected logic when calculating birthdates for wallets with zero received notes. - Version 1.3.0-beta17 *(2021-07-29)* ------------------------------------ - Fix: Autoshielding confirmation count error so funds are available after 10 confirmations. diff --git a/MIGRATIONS.md b/MIGRATIONS.md index 47770a5f..be382c77 100644 --- a/MIGRATIONS.md +++ b/MIGRATIONS.md @@ -1,6 +1,10 @@ Troubleshooting Migrations ========== +Upcoming Migrating to Version 1.4.* from 1.3.* +-------------------------------------- +Various APIs that have always been considered private have been moved into a new package called `internal`. While this should not be a breaking change, clients that might have relied on these internal classes should stop doing so. + Migrating to Version 1.3.* from 1.2.* -------------------------------------- The biggest breaking changes in 1.3 that inspired incrementing the minor version number was simplifying down to one "network aware" library rather than two separate libraries, each dedicated to either testnet or mainnet. This greatly simplifies the gradle configuration and has lots of other benefits. Wallets can now set a network with code similar to the following: diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountIntegrationTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountIntegrationTest.kt index 5a52ef72..307de94c 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountIntegrationTest.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountIntegrationTest.kt @@ -1,7 +1,7 @@ package cash.z.ecc.android.sdk.darkside // package cash.z.ecc.android.sdk.integration // // import cash.z.ecc.android.sdk.test.ScopedTest -// import cash.z.ecc.android.sdk.ext.twigTask +// import cash.z.ecc.android.sdk.internal.twigTask // import cash.z.ecc.android.sdk.darkside.test.DarksideTestCoordinator // import kotlinx.coroutines.runBlocking // import org.junit.BeforeClass diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountTest.kt index 21b377ee..6e696b79 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountTest.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiAccountTest.kt @@ -3,7 +3,7 @@ package cash.z.ecc.android.sdk.darkside // import cash.z.ecc.android.sdk.SdkSynchronizer // import cash.z.ecc.android.sdk.db.entity.isSubmitSuccess // import cash.z.ecc.android.sdk.test.ScopedTest -// import cash.z.ecc.android.sdk.ext.twig +// import cash.z.ecc.android.sdk.internal.twig // import cash.z.ecc.android.sdk.darkside.test.DarksideTestCoordinator // import kotlinx.coroutines.Job // import kotlinx.coroutines.delay diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt index ce730251..80ea9c64 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/MultiRecipientIntegrationTest.kt @@ -1,8 +1,8 @@ package cash.z.ecc.android.sdk.darkside // package cash.z.ecc.android.sdk.integration // // import cash.z.ecc.android.sdk.test.ScopedTest -// import cash.z.ecc.android.sdk.ext.twig -// import cash.z.ecc.android.sdk.ext.twigTask +// import cash.z.ecc.android.sdk.internal.twig +// import cash.z.ecc.android.sdk.internal.twigTask // import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService // import cash.z.ecc.android.sdk.darkside.test.DarksideTestCoordinator // import cash.z.ecc.android.sdk.util.SimpleMnemonics diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/InboundTxTests.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/InboundTxTests.kt index 37125280..35b25a92 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/InboundTxTests.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/InboundTxTests.kt @@ -3,7 +3,7 @@ package cash.z.ecc.android.sdk.darkside.reorgs import androidx.test.ext.junit.runners.AndroidJUnit4 import cash.z.ecc.android.sdk.darkside.test.ScopedTest -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.darkside.test.DarksideTestCoordinator import org.junit.BeforeClass import org.junit.Test diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgLargeTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgLargeTest.kt index 4566abdb..8737386f 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgLargeTest.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgLargeTest.kt @@ -6,7 +6,7 @@ package cash.z.ecc.android.sdk.darkside.reorgs // package cash.z.ecc.android.sdk // import cash.z.ecc.android.sdk.Synchronizer // import cash.z.ecc.android.sdk.test.ScopedTest // import cash.z.ecc.android.sdk.ext.import -// import cash.z.ecc.android.sdk.ext.twig +// import cash.z.ecc.android.sdk.internal.twig // import cash.z.ecc.android.sdk.darkside.test.DarksideApi // import io.grpc.StatusRuntimeException // import kotlinx.coroutines.delay diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgSmallTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgSmallTest.kt index d43c5529..39b3257c 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgSmallTest.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/reorgs/ReorgSmallTest.kt @@ -1,7 +1,7 @@ package cash.z.ecc.android.sdk.darkside.reorgs import androidx.test.ext.junit.runners.AndroidJUnit4 -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.darkside.test.DarksideTestCoordinator import cash.z.ecc.android.sdk.darkside.test.ScopedTest import org.junit.Assert.assertTrue diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideApi.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideApi.kt index bcd3d4c8..4d232486 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideApi.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideApi.kt @@ -2,7 +2,7 @@ package cash.z.ecc.android.sdk.darkside.test import android.content.Context import cash.z.ecc.android.sdk.R -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.wallet.sdk.rpc.Darkside diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideTestCoordinator.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideTestCoordinator.kt index 6d039678..1bd8a607 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideTestCoordinator.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/DarksideTestCoordinator.kt @@ -3,10 +3,9 @@ package cash.z.ecc.android.sdk.darkside.test import androidx.test.platform.app.InstrumentationRegistry import cash.z.ecc.android.sdk.SdkSynchronizer import cash.z.ecc.android.sdk.Synchronizer -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.type.ZcashNetwork import io.grpc.StatusRuntimeException -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.first diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/ScopedTest.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/ScopedTest.kt index c8c9d1e4..5a6af70f 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/ScopedTest.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/ScopedTest.kt @@ -2,9 +2,9 @@ package cash.z.ecc.android.sdk.darkside.test import android.content.Context import androidx.test.platform.app.InstrumentationRegistry -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob diff --git a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt index c48ee311..fc9e37aa 100644 --- a/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt +++ b/darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt @@ -7,8 +7,8 @@ import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.SdkSynchronizer import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.db.entity.isPending -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.WalletBalance diff --git a/demo-app/src/androidTest/java/cash/z/wallet/sdk/sample/demoapp/SampleCodeTest.kt b/demo-app/src/androidTest/java/cash/z/wallet/sdk/sample/demoapp/SampleCodeTest.kt index 11ddb1d6..e0987349 100644 --- a/demo-app/src/androidTest/java/cash/z/wallet/sdk/sample/demoapp/SampleCodeTest.kt +++ b/demo-app/src/androidTest/java/cash/z/wallet/sdk/sample/demoapp/SampleCodeTest.kt @@ -4,16 +4,12 @@ import androidx.test.platform.app.InstrumentationRegistry import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.db.entity.isFailure -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.ZcashSdk +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig import cash.z.ecc.android.sdk.ext.convertZecToZatoshi import cash.z.ecc.android.sdk.ext.toHex -import cash.z.ecc.android.sdk.ext.twig -import cash.z.ecc.android.sdk.jni.RustBackend +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService -import cash.z.ecc.android.sdk.internal.transaction.PagedTransactionRepository -import cash.z.ecc.android.sdk.internal.transaction.WalletTransactionEncoder import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.ZcashNetwork import kotlinx.coroutines.flow.collect diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/App.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/App.kt index cc380c57..5fbafc1c 100644 --- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/App.kt +++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/App.kt @@ -1,8 +1,8 @@ package cash.z.ecc.android.sdk.demoapp import android.app.Application -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig class App : Application() { diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listtransactions/ListTransactionsFragment.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listtransactions/ListTransactionsFragment.kt index 75d35b14..6bb370c5 100644 --- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listtransactions/ListTransactionsFragment.kt +++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listtransactions/ListTransactionsFragment.kt @@ -16,7 +16,7 @@ import cash.z.ecc.android.sdk.demoapp.databinding.FragmentListTransactionsBindin import cash.z.ecc.android.sdk.demoapp.ext.requireApplicationContext import cash.z.ecc.android.sdk.demoapp.util.fromResources import cash.z.ecc.android.sdk.ext.collectWith -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.ZcashNetwork diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listutxos/ListUtxosFragment.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listutxos/ListUtxosFragment.kt index 5bbcb547..fa4aa2b9 100644 --- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listutxos/ListUtxosFragment.kt +++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/listutxos/ListUtxosFragment.kt @@ -19,7 +19,7 @@ import cash.z.ecc.android.sdk.demoapp.ext.requireApplicationContext import cash.z.ecc.android.sdk.demoapp.util.fromResources import cash.z.ecc.android.sdk.demoapp.util.mainActivity import cash.z.ecc.android.sdk.ext.collectWith -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.ZcashNetwork import kotlinx.coroutines.Dispatchers diff --git a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/send/SendFragment.kt b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/send/SendFragment.kt index d08063c9..6dd5803c 100644 --- a/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/send/SendFragment.kt +++ b/demo-app/src/main/java/cash/z/ecc/android/sdk/demoapp/demos/send/SendFragment.kt @@ -23,12 +23,12 @@ import cash.z.ecc.android.sdk.demoapp.databinding.FragmentSendBinding import cash.z.ecc.android.sdk.demoapp.ext.requireApplicationContext import cash.z.ecc.android.sdk.demoapp.util.fromResources import cash.z.ecc.android.sdk.demoapp.util.mainActivity -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.Twig import cash.z.ecc.android.sdk.ext.collectWith import cash.z.ecc.android.sdk.ext.convertZatoshiToZecString import cash.z.ecc.android.sdk.ext.convertZecToZatoshi import cash.z.ecc.android.sdk.ext.toZecString -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.WalletBalance import cash.z.ecc.android.sdk.type.ZcashNetwork diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/TestnetIntegrationTest.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/TestnetIntegrationTest.kt index 3bfbb7e2..3b269d20 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/TestnetIntegrationTest.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/TestnetIntegrationTest.kt @@ -6,11 +6,11 @@ import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.Synchronizer.Status.SYNCED import cash.z.ecc.android.sdk.db.entity.isSubmitSuccess -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig import cash.z.ecc.android.sdk.ext.ZcashSdk import cash.z.ecc.android.sdk.ext.onFirst -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.test.ScopedTest import cash.z.ecc.android.sdk.tool.DerivationTool diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/service/ChangeServiceTest.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/service/ChangeServiceTest.kt index 8755dc2f..98751657 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/service/ChangeServiceTest.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/integration/service/ChangeServiceTest.kt @@ -8,7 +8,7 @@ import cash.z.ecc.android.sdk.internal.block.CompactBlockDownloader import cash.z.ecc.android.sdk.internal.block.CompactBlockStore import cash.z.ecc.android.sdk.exception.LightWalletException.ChangeServerException.ChainInfoNotMatching import cash.z.ecc.android.sdk.exception.LightWalletException.ChangeServerException.StatusException -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.internal.service.LightWalletService import cash.z.ecc.android.sdk.test.ScopedTest diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManagerTest.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManagerTest.kt index b630788d..99d75faf 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManagerTest.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManagerTest.kt @@ -7,9 +7,9 @@ import cash.z.ecc.android.sdk.annotation.TestPurpose import cash.z.ecc.android.sdk.db.entity.EncodedTransaction import cash.z.ecc.android.sdk.db.entity.PendingTransaction import cash.z.ecc.android.sdk.db.entity.isCancelled -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletService import cash.z.ecc.android.sdk.test.ScopedTest import com.nhaarman.mockitokotlin2.any diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/jni/TransparentTest.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/jni/TransparentTest.kt index 308070bf..ab36e288 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/jni/TransparentTest.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/jni/TransparentTest.kt @@ -5,8 +5,8 @@ import cash.z.ecc.android.bip39.Mnemonics.MnemonicCode import cash.z.ecc.android.bip39.toSeed import cash.z.ecc.android.sdk.annotation.MaintainedTest import cash.z.ecc.android.sdk.annotation.TestPurpose -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.ZcashNetwork import org.junit.Assert.assertEquals diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/ShieldFundsSample.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/ShieldFundsSample.kt index fda5c60f..63e849d5 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/ShieldFundsSample.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/ShieldFundsSample.kt @@ -1,6 +1,6 @@ package cash.z.ecc.android.sdk.sample -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.Twig import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.ecc.android.sdk.util.TestWallet import kotlinx.coroutines.runBlocking diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/TransparentRestoreSample.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/TransparentRestoreSample.kt index d1a2c6ca..1079412a 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/TransparentRestoreSample.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/sample/TransparentRestoreSample.kt @@ -2,7 +2,7 @@ package cash.z.ecc.android.sdk.sample import androidx.test.filters.LargeTest import cash.z.ecc.android.sdk.ext.ZcashSdk -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.type.ZcashNetwork.Testnet import cash.z.ecc.android.sdk.util.TestWallet import kotlinx.coroutines.delay diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/test/ScopedTest.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/test/ScopedTest.kt index 6486a91c..6175284f 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/test/ScopedTest.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/test/ScopedTest.kt @@ -2,9 +2,9 @@ package cash.z.ecc.android.sdk.test import android.content.Context import androidx.test.platform.app.InstrumentationRegistry -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/BalancePrinterUtil.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/BalancePrinterUtil.kt index 9ecc223e..84847522 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/BalancePrinterUtil.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/BalancePrinterUtil.kt @@ -3,9 +3,9 @@ package cash.z.ecc.android.sdk.util import androidx.test.platform.app.InstrumentationRegistry import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.Synchronizer -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.tool.WalletBirthdayTool import cash.z.ecc.android.sdk.type.WalletBirthday import cash.z.ecc.android.sdk.type.ZcashNetwork diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/DataDbScannerUtil.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/DataDbScannerUtil.kt index 38f66455..f978947c 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/DataDbScannerUtil.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/DataDbScannerUtil.kt @@ -4,8 +4,8 @@ import androidx.test.platform.app.InstrumentationRegistry import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.SdkSynchronizer import cash.z.ecc.android.sdk.Synchronizer -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt index 1843aa06..45bf2279 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt @@ -7,8 +7,8 @@ import cash.z.ecc.android.sdk.Initializer import cash.z.ecc.android.sdk.SdkSynchronizer import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.db.entity.isPending -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.WalletBalance diff --git a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TransactionCounterUtil.kt b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TransactionCounterUtil.kt index 9199dfbc..47cd2c5e 100644 --- a/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TransactionCounterUtil.kt +++ b/sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TransactionCounterUtil.kt @@ -1,9 +1,9 @@ package cash.z.ecc.android.sdk.util import androidx.test.platform.app.InstrumentationRegistry -import cash.z.ecc.android.sdk.ext.TroubleshootingTwig -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.TroubleshootingTwig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.type.ZcashNetwork import org.junit.Ignore diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/Initializer.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/Initializer.kt index cacd2633..b27a34ee 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/Initializer.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/Initializer.kt @@ -3,7 +3,7 @@ package cash.z.ecc.android.sdk import android.content.Context import cash.z.ecc.android.sdk.exception.InitializerException import cash.z.ecc.android.sdk.ext.ZcashSdk -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.jni.RustBackend import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.tool.WalletBirthdayTool diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/SdkSynchronizer.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/SdkSynchronizer.kt index c070faba..bf996193 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/SdkSynchronizer.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/SdkSynchronizer.kt @@ -36,8 +36,8 @@ import cash.z.ecc.android.sdk.ext.ConsensusBranchId import cash.z.ecc.android.sdk.ext.ZcashSdk import cash.z.ecc.android.sdk.internal.ext.toHexReversed import cash.z.ecc.android.sdk.internal.ext.tryNull -import cash.z.ecc.android.sdk.ext.twig -import cash.z.ecc.android.sdk.ext.twigTask +import cash.z.ecc.android.sdk.internal.twig +import cash.z.ecc.android.sdk.internal.twigTask import cash.z.ecc.android.sdk.internal.service.LightWalletGrpcService import cash.z.ecc.android.sdk.internal.service.LightWalletService import cash.z.ecc.android.sdk.tool.DerivationTool diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/block/CompactBlockProcessor.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/block/CompactBlockProcessor.kt index 1a8f0325..8ecc7d6e 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/block/CompactBlockProcessor.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/block/CompactBlockProcessor.kt @@ -20,7 +20,7 @@ import cash.z.ecc.android.sdk.exception.CompactBlockProcessorException.Mismatche import cash.z.ecc.android.sdk.exception.InitializerException import cash.z.ecc.android.sdk.exception.RustLayerException import cash.z.ecc.android.sdk.ext.BatchMetrics -import cash.z.ecc.android.sdk.ext.Twig +import cash.z.ecc.android.sdk.internal.Twig import cash.z.ecc.android.sdk.ext.ZcashSdk import cash.z.ecc.android.sdk.ext.ZcashSdk.DOWNLOAD_BATCH_SIZE import cash.z.ecc.android.sdk.ext.ZcashSdk.MAX_BACKOFF_INTERVAL @@ -32,8 +32,8 @@ import cash.z.ecc.android.sdk.ext.ZcashSdk.SCAN_BATCH_SIZE import cash.z.ecc.android.sdk.internal.ext.retryUpTo import cash.z.ecc.android.sdk.internal.ext.retryWithBackoff import cash.z.ecc.android.sdk.internal.ext.toHexReversed -import cash.z.ecc.android.sdk.ext.twig -import cash.z.ecc.android.sdk.ext.twigTask +import cash.z.ecc.android.sdk.internal.twig +import cash.z.ecc.android.sdk.internal.twigTask import cash.z.ecc.android.sdk.internal.block.CompactBlockDownloader import cash.z.ecc.android.sdk.jni.RustBackend import cash.z.ecc.android.sdk.jni.RustBackendWelding diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/SaplingParamTool.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/SaplingParamTool.kt index 8c3b99ed..6383165a 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/SaplingParamTool.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/SaplingParamTool.kt @@ -1,10 +1,7 @@ package cash.z.ecc.android.sdk.internal import cash.z.ecc.android.sdk.exception.TransactionEncoderException -import cash.z.ecc.android.sdk.ext.Bush import cash.z.ecc.android.sdk.ext.ZcashSdk -import cash.z.ecc.android.sdk.ext.twig -import cash.z.ecc.android.sdk.ext.twigTask import com.squareup.okhttp.OkHttpClient import com.squareup.okhttp.Request import kotlinx.coroutines.Dispatchers diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/Twig.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/Twig.kt similarity index 99% rename from sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/Twig.kt rename to sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/Twig.kt index 2fe36c12..7e855f09 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/Twig.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/Twig.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE") -package cash.z.ecc.android.sdk.ext +package cash.z.ecc.android.sdk.internal import java.util.concurrent.CopyOnWriteArraySet import kotlin.math.roundToLong diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/block/CompactBlockDownloader.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/block/CompactBlockDownloader.kt index df55902d..c808761e 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/block/CompactBlockDownloader.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/block/CompactBlockDownloader.kt @@ -2,7 +2,7 @@ package cash.z.ecc.android.sdk.internal.block import cash.z.ecc.android.sdk.exception.LightWalletException import cash.z.ecc.android.sdk.internal.ext.retryUpTo import cash.z.ecc.android.sdk.internal.ext.tryWarn -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletService import cash.z.wallet.sdk.rpc.Service import io.grpc.StatusRuntimeException diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/DerivedDataDb.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/DerivedDataDb.kt index e9a96aa3..7b7ed5ef 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/DerivedDataDb.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/db/DerivedDataDb.kt @@ -16,7 +16,7 @@ import cash.z.ecc.android.sdk.db.entity.Received import cash.z.ecc.android.sdk.db.entity.Sent import cash.z.ecc.android.sdk.db.entity.TransactionEntity import cash.z.ecc.android.sdk.db.entity.Utxo -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.type.UnifiedAddressAccount // diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/Ext.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/Ext.kt index d7a660d8..3ce63d3b 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/Ext.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/Ext.kt @@ -1,6 +1,6 @@ package cash.z.ecc.android.sdk.internal.ext -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig internal inline fun tryNull(block: () -> R): R? { return try { diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/WalletService.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/WalletService.kt index c75ecb0e..679a9352 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/WalletService.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/WalletService.kt @@ -2,7 +2,7 @@ package cash.z.ecc.android.sdk.internal.ext import android.content.Context import cash.z.ecc.android.sdk.ext.ZcashSdk.MAX_BACKOFF_INTERVAL -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import kotlinx.coroutines.delay import java.io.File import kotlin.random.Random diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/android/FlowPagedListBuilder.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/android/FlowPagedListBuilder.kt index 5f814b12..45329481 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/android/FlowPagedListBuilder.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/ext/android/FlowPagedListBuilder.kt @@ -6,8 +6,8 @@ import android.os.Looper import androidx.paging.Config import androidx.paging.DataSource import androidx.paging.PagedList -import cash.z.ecc.android.sdk.ext.Twig -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.Twig +import cash.z.ecc.android.sdk.internal.twig import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExecutorCoroutineDispatcher diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/service/LightWalletGrpcService.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/service/LightWalletGrpcService.kt index 33081f2d..d188c8bd 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/service/LightWalletGrpcService.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/service/LightWalletGrpcService.kt @@ -4,7 +4,7 @@ import android.content.Context import cash.z.ecc.android.sdk.R import cash.z.ecc.android.sdk.annotation.OpenForTesting import cash.z.ecc.android.sdk.exception.LightWalletException -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.type.ZcashNetwork import cash.z.wallet.sdk.rpc.CompactFormats import cash.z.wallet.sdk.rpc.CompactTxStreamerGrpc diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PagedTransactionRepository.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PagedTransactionRepository.kt index 19002e45..91ed7ad9 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PagedTransactionRepository.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PagedTransactionRepository.kt @@ -15,7 +15,7 @@ import cash.z.ecc.android.sdk.internal.ext.android.RefreshableDataSourceFactory import cash.z.ecc.android.sdk.internal.ext.android.toFlowPagedList import cash.z.ecc.android.sdk.internal.ext.android.toRefreshable import cash.z.ecc.android.sdk.internal.ext.tryWarn -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.jni.RustBackend import cash.z.ecc.android.sdk.type.UnifiedAddressAccount import cash.z.ecc.android.sdk.type.UnifiedViewingKey diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManager.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManager.kt index f56333c4..01b03a8e 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManager.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/PersistentTransactionManager.kt @@ -10,7 +10,7 @@ import cash.z.ecc.android.sdk.db.entity.PendingTransactionEntity import cash.z.ecc.android.sdk.db.entity.isCancelled import cash.z.ecc.android.sdk.db.entity.isFailedEncoding import cash.z.ecc.android.sdk.db.entity.isSubmitted -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.internal.service.LightWalletService import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers.IO diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/WalletTransactionEncoder.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/WalletTransactionEncoder.kt index 083188b0..c5d7a2b3 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/WalletTransactionEncoder.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/WalletTransactionEncoder.kt @@ -3,8 +3,8 @@ package cash.z.ecc.android.sdk.internal.transaction import cash.z.ecc.android.sdk.db.entity.EncodedTransaction import cash.z.ecc.android.sdk.exception.TransactionEncoderException import cash.z.ecc.android.sdk.ext.masked -import cash.z.ecc.android.sdk.ext.twig -import cash.z.ecc.android.sdk.ext.twigTask +import cash.z.ecc.android.sdk.internal.twig +import cash.z.ecc.android.sdk.internal.twigTask import cash.z.ecc.android.sdk.jni.RustBackend import cash.z.ecc.android.sdk.jni.RustBackendWelding import cash.z.ecc.android.sdk.internal.SaplingParamTool diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/jni/RustBackend.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/jni/RustBackend.kt index c006ad27..35f27233 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/jni/RustBackend.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/jni/RustBackend.kt @@ -3,7 +3,7 @@ package cash.z.ecc.android.sdk.jni import cash.z.ecc.android.sdk.exception.BirthdayException import cash.z.ecc.android.sdk.ext.ZcashSdk.OUTPUT_PARAM_FILE_NAME import cash.z.ecc.android.sdk.ext.ZcashSdk.SPEND_PARAM_FILE_NAME -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.UnifiedViewingKey import cash.z.ecc.android.sdk.type.WalletBalance diff --git a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/tool/WalletBirthdayTool.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/tool/WalletBirthdayTool.kt index 8b45c051..4eca01ae 100644 --- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/tool/WalletBirthdayTool.kt +++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/tool/WalletBirthdayTool.kt @@ -3,7 +3,7 @@ package cash.z.ecc.android.sdk.tool import android.content.Context import androidx.annotation.VisibleForTesting import cash.z.ecc.android.sdk.exception.BirthdayException -import cash.z.ecc.android.sdk.ext.twig +import cash.z.ecc.android.sdk.internal.twig import cash.z.ecc.android.sdk.type.WalletBirthday import cash.z.ecc.android.sdk.type.ZcashNetwork import com.google.gson.Gson