Merge pull request #1162 from fluidvanadium/change_required_5_000

Fix ChangeRequired

Author: zancas

Cargo.lock

@@ -17,14 +17,14 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-zcash_address = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b" }
-zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b", features = ["lightwalletd-tonic", "orchard", "transparent-inputs"] }
-zcash_encoding = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b" }
-zcash_keys = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b", features = ["orchard"] }
+zcash_address = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required" }
+zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required", features = ["lightwalletd-tonic", "orchard", "transparent-inputs"] }
+zcash_encoding = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required" }
+zcash_keys = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required", features = ["orchard"] }
 zcash_note_encryption = "0.4"
-zcash_primitives = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b" }
-zcash_proofs = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b" }
-zcash_protocol = { git = "https://github.com/zingolabs/librustzcash.git", tag = "custom_notusk_to_taddr-1-g239c894b" }
+zcash_primitives = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required" }
+zcash_proofs = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required" }
+zcash_protocol = { git = "https://github.com/zingolabs/librustzcash.git", tag = "fix_change_required" }
 sapling-crypto = "0.1.2"
 orchard = "0.8"
 zip32 = "0.1"

Cargo.toml

@@ -3,6 +3,7 @@ use zcash_client_backend::PoolType::Transparent;
 use zcash_client_backend::ShieldedProtocol::Orchard;
 use zcash_client_backend::ShieldedProtocol::Sapling;
 
+use zingo_testutils::chain_generic_tests::fixtures::change_required;
 use zingo_testutils::chain_generic_tests::fixtures::ignore_dust_inputs;
 use zingo_testutils::chain_generic_tests::fixtures::propose_and_broadcast_value_to_pool;
 use zingo_testutils::chain_generic_tests::fixtures::send_grace_dust;
@@ -38,6 +39,10 @@ async fn libtonode_propose_and_broadcast_40_000_to_orchard() {
     propose_and_broadcast_value_to_pool::<LibtonodeEnvironment>(40_000, Shielded(Orchard)).await;
 }
 #[tokio::test]
+async fn libtonode_change_required() {
+    change_required::<LibtonodeEnvironment>().await;
+}
+#[tokio::test]
 async fn libtonode_send_shield_cycle() {
     send_shield_cycle::<LibtonodeEnvironment>(4).await;
 }

integration-tests/tests/chain_generic_tests.rs

@@ -127,6 +127,27 @@ pub mod fixtures {
         assert_eq!(expected_fee, recorded_fee);
     }
 
+    /// required change should be 0
+    pub async fn change_required<CC>()
+    where
+        CC: ConductChain,
+    {
+        let mut environment = CC::setup().await;
+        let primary = environment.fund_client_orchard(45_000).await;
+        let secondary = environment.create_client().await;
+
+        assert_eq!(
+            with_assertions::propose_send_bump_sync_recipient(
+                &mut environment,
+                &primary,
+                &secondary,
+                vec![(Shielded(Orchard), 1), (Shielded(Orchard), 29_999)]
+            )
+            .await,
+            3 * MARGINAL_FEE.into_u64()
+        );
+    }
+
     /// sends back and forth several times, including sends to transparent
     pub async fn send_shield_cycle<CC>(n: u64)
     where

zingo-testutils/src/chain_generic_tests.rs

@@ -60,6 +60,9 @@ where
         .collect();
 
     let proposal = from_inputs::propose(sender, raw_receivers).await.unwrap();
+
+    dbg!(proposal.steps().first().balance().proposed_change());
+
     let txids = sender
         .complete_and_broadcast_stored_proposal()
         .await