Derive subaccount for t-addr too

native/warp_api_ffi/src/api.rs

@@ -18,14 +18,22 @@ use zcash_multisig::{
 };
 use zcash_primitives::transaction::builder::Progress;
 
-#[used] static RUNTIME: OnceCell<Mutex<Runtime>> = OnceCell::new();
-#[used] static YWALLET: OnceCell<Mutex<Wallet>> = OnceCell::new();
-#[used] static ZWALLET: OnceCell<Mutex<Wallet>> = OnceCell::new();
-#[used] static YMEMPOOL: OnceCell<Mutex<MemPool>> = OnceCell::new();
-#[used] static ZMEMPOOL: OnceCell<Mutex<MemPool>> = OnceCell::new();
-#[used] static SYNCLOCK: OnceCell<Mutex<()>> = OnceCell::new();
-#[used] static MULTISIG_AGG_LOCK: OnceCell<Mutex<MultisigAggregator>> = OnceCell::new();
-#[used] static MULTISIG_SIGN_LOCK: OnceCell<Mutex<MultisigClient>> = OnceCell::new();
+#[used]
+static RUNTIME: OnceCell<Mutex<Runtime>> = OnceCell::new();
+#[used]
+static YWALLET: OnceCell<Mutex<Wallet>> = OnceCell::new();
+#[used]
+static ZWALLET: OnceCell<Mutex<Wallet>> = OnceCell::new();
+#[used]
+static YMEMPOOL: OnceCell<Mutex<MemPool>> = OnceCell::new();
+#[used]
+static ZMEMPOOL: OnceCell<Mutex<MemPool>> = OnceCell::new();
+#[used]
+static SYNCLOCK: OnceCell<Mutex<()>> = OnceCell::new();
+#[used]
+static MULTISIG_AGG_LOCK: OnceCell<Mutex<MultisigAggregator>> = OnceCell::new();
+#[used]
+static MULTISIG_SIGN_LOCK: OnceCell<Mutex<MultisigClient>> = OnceCell::new();
 
 fn get_lock<T>(cell: &OnceCell<Mutex<T>>) -> anyhow::Result<MutexGuard<T>> {
     cell.get()

native/zcash-sync

@@ -1 +1 @@
-Subproject commit 71d1ce2891f2e8579e9b226169c06883fbf4635f
+Subproject commit 63bf8e0374753bea0ff6a09c8fac286999d3fa06

pubspec.lock

@@ -606,13 +606,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.3"
   material_design_icons_flutter:
     dependency: "direct main"
     description:
@@ -1205,7 +1198,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.8"
+    version: "0.4.3"
   timing:
     dependency: transitive
     description:

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.0.1+1
+version: 1.2.1+204
 
 environment:
   sdk: ">=2.12.0 <3.0.0"