From b47b10427ec20b700eb4061064dae70b9c3c31c9 Mon Sep 17 00:00:00 2001
From: Kevin Gorham <kevin.gorham@electriccoin.co>
Date: Fri, 13 Dec 2019 10:58:20 -0500
Subject: [PATCH] Blossom activation.

---
 Cargo.toml           | 10 +++++-----
 src/main/rust/lib.rs |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6b083912..6f73ce01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,23 +22,23 @@ protobuf = { version = "2", optional = true }
 
 [dependencies.ff]
 git = "https://github.com/str4d/librustzcash.git"
-rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
+rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
 
 [dependencies.pairing]
 git = "https://github.com/str4d/librustzcash.git"
-rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
+rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
 
 [dependencies.zcash_client_backend]
 git = "https://github.com/str4d/librustzcash.git"
-rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
+rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
 
 [dependencies.zcash_client_sqlite]
 git = "https://github.com/str4d/librustzcash.git"
-rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
+rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
 
 [dependencies.zcash_primitives]
 git = "https://github.com/str4d/librustzcash.git"
-rev = "1cbeac9d593d65938870797fb8dbafa352644d34"
+rev = "f3f5338282eeda6d9f5bff69f6930a5473c95925"
 
 [dependencies.zcash_proofs]
 git = "https://github.com/str4d/librustzcash.git"
diff --git a/src/main/rust/lib.rs b/src/main/rust/lib.rs
index 67ebbd69..640a8d66 100644
--- a/src/main/rust/lib.rs
+++ b/src/main/rust/lib.rs
@@ -15,7 +15,6 @@ use std::panic;
 use std::path::Path;
 use std::ptr;
 use zcash_client_backend::{
-    constants::SAPLING_CONSENSUS_BRANCH_ID,
     encoding::{
         decode_extended_spending_key, encode_extended_full_viewing_key,
         encode_extended_spending_key,
@@ -36,6 +35,7 @@ use zcash_client_sqlite::{
 };
 use zcash_primitives::{
     block::BlockHash,
+    consensus::BranchId,
     note_encryption::Memo,
     transaction::components::Amount,
     zip32::{ExtendedFullViewingKey, ExtendedSpendingKey},
@@ -541,14 +541,14 @@ pub unsafe extern "C" fn Java_cash_z_wallet_sdk_jni_RustBackend_createToAddress(
 
         create_to_address(
             &db_data,
-            SAPLING_CONSENSUS_BRANCH_ID,
+            BranchId::Blossom,
             prover,
             (account, &extsk),
             &to,
             value,
             memo,
         )
-        .map_err(|e| format_err!("Error while sending funds: {}", e))
+        .map_err(|e| format_err!("Error while creating transaction: {}", e))
     });
     unwrap_exc_or(&env, res, -1)
 }