fix: support for NU6.1 (#683)

Author: hhanh00

rust/Cargo.lock

@@ -45,17 +45,18 @@ rayon = "1.10"
 qrcode = "0.14.1"
 raptorq = "2.0.0"
 
-zcash_address = "0.9"
+zcash_address = "0.10"
 zcash_encoding = "0.3"
-zcash_keys = {version = "0.10", features = ["sapling", "orchard", "transparent-inputs"]}
+zcash_keys = {version = "0.12", features = ["sapling", "orchard", "transparent-inputs"]}
 zcash_note_encryption = "0.4"
-zcash_primitives = {version = "0.24", features = ["transparent-inputs"]}
-zcash_proofs = {version = "0.24", features = ["bundled-prover"]}
-zcash_protocol = {version = "0.6", features = ["local-consensus"]}
-zcash_transparent = {version = "0.4", features = ["transparent-inputs"]}
-pczt = { version = "0.3", features = ["zcp-builder", "io-finalizer", "prover", "signer", "spend-finalizer", "tx-extractor", "transparent", "sapling", "orchard"] }
+zcash_script = "0.4"
+zcash_primitives = {version = "0.26", features = ["transparent-inputs"]}
+zcash_proofs = {version = "0.26", features = ["bundled-prover"]}
+zcash_protocol = {version = "0.7", features = ["local-consensus"]}
+zcash_transparent = {version = "0.6", features = ["transparent-inputs"]}
+pczt = { version = "0.5", features = ["zcp-builder", "io-finalizer", "prover", "signer", "spend-finalizer", "tx-extractor", "transparent", "sapling", "orchard"] }
 orchard = {version = "0.11", features = ["unstable-frost"]}
-zip321 = "0.5"
+zip321 = "0.6"
 
 reddsa = {git="https://github.com/ZcashFoundation/reddsa.git", rev="975f9ca835c4b9196c81608e55192b0f711e951d", features=["frost"]}
 frost-rerandomized = "2.1.0"
@@ -125,15 +126,15 @@ orchard = { git = "https://github.com/hhanh00/orchard.git", rev = "c06fec6d69c7e
 zcash_note_encryption = { git = "https://github.com/zcash/zcash_note_encryption.git", rev = "ede44ea608e667c78309c598fbf4d70f69c15c29" }
 
 sapling-crypto = { git = "https://github.com/zcash/sapling-crypto.git", rev = "0475817b60fced17ec59b0c9412d2b2d29ef529f" }
-zcash_address = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zcash_encoding = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zcash_keys = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zcash_primitives = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zcash_proofs = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zcash_protocol = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zcash_transparent = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-pczt = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
-zip321 = { git = "https://github.com/hhanh00/librustzcash.git", rev = "0621a88485c947909664d0d94a1b8b2c3ebf21e2" }
+zcash_address = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zcash_encoding = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zcash_keys = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zcash_primitives = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zcash_proofs = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zcash_protocol = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zcash_transparent = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+pczt = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
+zip321 = { git = "https://github.com/hhanh00/librustzcash.git", rev = "27c170eee23d51cc2d5ee1bf161a12042fd387a1" }
 
 # sapling-crypto = { path = "../../sapling-crypto" }
 # zcash_address = { path = "../../librustzcash/components/zcash_address" }

rust/Cargo.toml

@@ -29,6 +29,7 @@ use crate::{
 };
 use secp256k1::{PublicKey, SecretKey};
 use zcash_keys::keys::{sapling::ExtendedSpendingKey, UnifiedFullViewingKey, UnifiedSpendingKey};
+use zcash_transparent::address::TransparentAddress;
 
 #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
 use crate::ledger::fvk::{get_hw_next_diversifier_address, get_hw_transparent_address};
@@ -53,7 +54,6 @@ use sqlx::{sqlite::SqliteRow, Connection, Row, SqliteConnection};
 use zcash_keys::{
     address::UnifiedAddress, encoding::AddressCodec as _, keys::UnifiedAddressRequest,
 };
-use zcash_primitives::legacy::TransparentAddress;
 use zcash_protocol::consensus::{NetworkConstants, NetworkUpgrade, Parameters};
 use zcash_transparent::keys::{
     AccountPrivKey, AccountPubKey, NonHardenedChildIndex, TransparentKeyScope,

rust/src/account.rs

@@ -15,9 +15,9 @@ use zcash_keys::{
     encoding::AddressCodec,
     keys::{UnifiedAddressRequest, UnifiedFullViewingKey, UnifiedSpendingKey},
 };
-use zcash_primitives::{
-    consensus::Parameters as ZkParams, legacy::TransparentAddress, zip32::AccountId,
-};
+use zcash_transparent::address::TransparentAddress;
+use zip32::AccountId;
+use zcash_protocol::consensus::Parameters as ZkParams;
 
 use crate::{
     account::derive_transparent_address,

rust/src/api/account.rs

@@ -58,7 +58,7 @@ impl Coin {
 
         let mut connection = pool.acquire().await?;
 
-        let coin = crate::db::get_prop(&mut *connection, "coin")
+        let coin = crate::db::get_prop(&mut connection, "coin")
             .await?
             .unwrap_or("0".to_string());
         let coin = coin.parse::<u8>()?;
@@ -211,7 +211,7 @@ impl Coin {
 
 async fn try_open(db_filepath: &str, password: &Option<String>) -> Result<SqlitePool> {
     // Create a connection pool
-    let options = get_connect_options(&db_filepath, password);
+    let options = get_connect_options(db_filepath, password);
     let pool = SqlitePoolOptions::new()
         .max_connections(5)
         .idle_timeout(std::time::Duration::from_secs(30))

rust/src/api/coin.rs

@@ -3,6 +3,7 @@ use flutter_rust_bridge::frb;
 use futures::TryStreamExt as _;
 use sqlx::SqliteConnection;
 use sqlx::{sqlite::SqliteRow, Connection as _, Row};
+use zcash_transparent::address::TransparentAddress;
 use std::collections::HashMap;
 use std::sync::LazyLock;
 use tokio::sync::mpsc::channel;
@@ -12,7 +13,6 @@ use zcash_keys::encoding::AddressCodec as _;
 
 use crate::budget::merge_pending_txs;
 use crate::api::coin::{Coin, Network};
-use zcash_primitives::legacy::TransparentAddress;
 
 use crate::db::{calculate_balance, store_block_header};
 use crate::io::SyncHeight;

rust/src/api/sync.rs

@@ -12,8 +12,8 @@ use zcash_keys::{
     encoding::{decode_extended_full_viewing_key, decode_extended_spending_key, AddressCodec as _},
     keys::UnifiedFullViewingKey,
 };
-use zcash_primitives::legacy::TransparentAddress;
 use zcash_protocol::consensus::NetworkConstants as _;
+use zcash_transparent::address::TransparentAddress;
 
 use crate::{
     bip38,

rust/src/key.rs

@@ -27,7 +27,8 @@ use sqlx::{pool::PoolConnection, Sqlite, SqliteConnection};
 use tracing::info;
 use zcash_keys::encoding::AddressCodec;
 use zcash_note_encryption::{try_output_recovery_with_ovk, Domain, EphemeralKeyBytes};
-use zcash_primitives::legacy::{Script, TransparentAddress};
+use zcash_script::script::Evaluable;
+use zcash_transparent::address::TransparentAddress;
 use zcash_proofs::prover::LocalTxProver;
 use zcash_protocol::{consensus::NetworkConstants, memo::Memo};
 
@@ -144,7 +145,9 @@ pub async fn sign_transaction<D: Device + Sync, R: RngCore + CryptoRng>(
             data.write_u32::<LE>(aindex | 0x80000000)?;
             data.write_u32::<LE>(scope)?;
             data.write_u32::<LE>(dindex)?;
-            address.script().write(&mut data)?;
+            let address_script = address.script();
+            data.write_u8(address_script.byte_len() as u8)?;
+            data.write_all(&address_script.to_bytes())?;
             data.write_u64::<LE>(*tin.value())?;
             assert_eq!(data.len(), 54);
             buffers.push(data);
@@ -160,7 +163,9 @@ pub async fn sign_transaction<D: Device + Sync, R: RngCore + CryptoRng>(
             touts.push(pczt_tout);
 
             let mut data = vec![];
-            Script(tout.script_pubkey().to_vec()).write(&mut data)?;
+            let output_script = tout.script_pubkey();
+            data.write_u8(output_script.len() as u8)?;
+            data.write_all(output_script)?;
             data.write_u64::<LE>(*tout.value())?;
             assert_eq!(data.len(), 34);
             buffers.push(data);
@@ -461,7 +466,9 @@ pub async fn sign_transaction<D: Device + Sync, R: RngCore + CryptoRng>(
             let mut data = vec![];
             data.write_all(tin.prevout_txid())?;
             data.write_u32::<LE>(*tin.prevout_index())?;
-            Script(tin.script_pubkey().to_vec()).write(&mut data)?;
+            let input_script = tin.script_pubkey();
+            data.write_u8(input_script.len() as u8)?;
+            data.write_all(input_script)?;
             data.write_u64::<LE>(*tin.value())?;
             data.write_u32::<LE>(tin.sequence().unwrap_or(0xFFFFFFFFu32))?;
             assert_eq!(data.len(), 74);

rust/src/ledger/builder.rs

@@ -5,8 +5,8 @@ use sapling_crypto::{keys::FullViewingKey, PaymentAddress};
 use secp256k1::PublicKey;
 use sqlx::SqliteConnection;
 use zcash_keys::encoding::AddressCodec;
-use zcash_primitives::legacy::TransparentAddress;
 use zcash_protocol::consensus::NetworkConstants;
+use zcash_transparent::address::TransparentAddress;
 
 use crate::{
     account::get_sapling_address, api::coin::Network, db::{get_account_aindex, get_account_dindex}, ledger::{connect_ledger, APDUCommand, Device, LedgerError, LedgerResult}, tiu, IntoAnyhow