TransactionBuilder TxOutContext

android-bindings/src/bindings.rs

@@ -54,7 +54,7 @@ use mc_transaction_core::{
 use mc_transaction_std::{
     AuthenticatedSenderMemo, AuthenticatedSenderWithPaymentRequestIdMemo, ChangeDestination,
     DestinationMemo, InputCredentials, MemoBuilder, MemoPayload, RTHMemoBuilder,
-    SenderMemoCredential, TransactionBuilder,
+    SenderMemoCredential, TransactionBuilder, TxOutContext,
 };
 
 use mc_util_from_random::FromRandom;
@@ -1478,6 +1478,65 @@ pub unsafe extern "C" fn Java_com_mobilecoin_lib_TxOut_decrypt_1memo_1payload(
     )
 }
 
+/********************************************************************
+ * TxOutContext
+ */
+#[no_mangle]
+pub unsafe extern "C" fn Java_com_mobilecoin_lib_TxOutContext_get_1tx_1out(
+    env: JNIEnv,
+    obj: JObject,
+) -> jlong {
+    jni_ffi_call_or(
+        || Ok(0),
+        &env,
+        |env| {
+            let tx_out_context: MutexGuard<TxOutContext> =
+                env.get_rust_field(obj, RUST_OBJ_FIELD)?;
+            let tx_out = tx_out_context.tx_out.to_owned();
+            let mbox = Box::new(Mutex::new(tx_out));
+            let ptr: *mut Mutex<TxOut> = Box::into_raw(mbox);
+            Ok(ptr as jlong)
+        },
+    )
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn Java_com_mobilecoin_lib_TxOutContext_get_1confirmation_1number(
+    env: JNIEnv,
+    obj: JObject,
+) -> jbyteArray {
+    jni_ffi_call_or(
+        || Ok(JObject::null().into_inner()),
+        &env,
+        |env| {
+            let tx_out_context: MutexGuard<TxOutContext> =
+                env.get_rust_field(obj, RUST_OBJ_FIELD)?;
+            let confirmation_number = &tx_out_context.confirmation;
+            let bytes = mc_util_serial::encode(confirmation_number);
+            Ok(env.byte_array_from_slice(&bytes)?)
+        },
+    )
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn Java_com_mobilecoin_lib_TxOutContext_get_1shared_1secret(
+    env: JNIEnv,
+    obj: JObject,
+) -> jlong {
+    jni_ffi_call_or(
+        || Ok(0),
+        &env,
+        |env| {
+            let tx_out_context: MutexGuard<TxOutContext> =
+                env.get_rust_field(obj, RUST_OBJ_FIELD)?;
+            let shared_secret = tx_out_context.shared_secret.to_owned();
+            let mbox = Box::new(Mutex::new(shared_secret));
+            let ptr: *mut Mutex<RistrettoPublic> = Box::into_raw(mbox);
+            Ok(ptr as jlong)
+        },
+    )
+}
+
 /********************************************************************
  * TxOutMembershipProof
  */
@@ -1713,8 +1772,8 @@ pub unsafe extern "C" fn Java_com_mobilecoin_lib_TransactionBuilder_add_1output(
                 env.get_rust_field(recipient, RUST_OBJ_FIELD)?;
 
             let mut rng = McRng::default();
-            let (tx_out, confirmation_number) =
-                tx_builder.add_output(value as u64, &recipient, &mut rng)?;
+            let tx_out_context = tx_builder.add_output(value as u64, &recipient, &mut rng)?;
+            let confirmation_number = &tx_out_context.confirmation;
             if !confirmation_number_out.is_null() {
                 let len = env.get_array_length(confirmation_number_out)?;
                 if len as usize >= confirmation_number.to_vec().len() {
@@ -1731,8 +1790,8 @@ pub unsafe extern "C" fn Java_com_mobilecoin_lib_TransactionBuilder_add_1output(
                 }
             }
 
-            let mbox = Box::new(Mutex::new(tx_out));
-            let ptr: *mut Mutex<TxOut> = Box::into_raw(mbox);
+            let mbox = Box::new(Mutex::new(tx_out_context));
+            let ptr: *mut Mutex<TxOutContext> = Box::into_raw(mbox);
             Ok(ptr as jlong)
         },
     )
@@ -1760,8 +1819,9 @@ pub unsafe extern "C" fn Java_com_mobilecoin_lib_TransactionBuilder_add_1change_
                 ChangeDestination::from(&*source_account_key);
             let mut rng = McRng::default();
 
-            let (tx_out, confirmation_number) =
+            let tx_out_context =
                 tx_builder.add_change_output(value, &change_destination, &mut rng)?;
+            let confirmation_number = &tx_out_context.confirmation;
             if !confirmation_number_out.is_null() {
                 let len = env.get_array_length(confirmation_number_out)?;
                 if len as usize >= confirmation_number.to_vec().len() {
@@ -1778,8 +1838,8 @@ pub unsafe extern "C" fn Java_com_mobilecoin_lib_TransactionBuilder_add_1change_
                 }
             }
 
-            let mbox = Box::new(Mutex::new(tx_out));
-            let ptr: *mut Mutex<TxOut> = Box::into_raw(mbox);
+            let mbox = Box::new(Mutex::new(tx_out_context));
+            let ptr: *mut Mutex<TxOutContext> = Box::into_raw(mbox);
             Ok(ptr as jlong)
         },
     )

libmobilecoin/include/transaction.h

@@ -216,9 +216,10 @@ McData* MC_NULLABLE mc_transaction_builder_add_output(
   const McPublicAddress* MC_NONNULL recipient_address,
   McRngCallback* MC_NULLABLE rng_callback,
   McMutableBuffer* MC_NONNULL out_tx_out_confirmation_number,
+  McMutableBuffer* MC_NONNULL out_tx_out_shared_secret,
   McError* MC_NULLABLE * MC_NULLABLE out_error
 )
-MC_ATTRIBUTE_NONNULL(1, 3, 6);
+MC_ATTRIBUTE_NONNULL(1, 3, 5, 6);
 
 /// # Preconditions
 ///
@@ -237,9 +238,10 @@ McData* MC_NULLABLE mc_transaction_builder_add_change_output(
   uint64_t amount,
   McRngCallback* MC_NULLABLE rng_callback,
   McMutableBuffer* MC_NONNULL out_tx_out_confirmation_number,
+  McMutableBuffer* MC_NONNULL out_tx_out_shared_secret,
   McError* MC_NULLABLE * MC_NULLABLE out_error
 )
-MC_ATTRIBUTE_NONNULL(1, 2, 4, 6);
+MC_ATTRIBUTE_NONNULL(1, 2, 4, 5, 6);
 
 /// # Preconditions
 ///

libmobilecoin/libmobilecoin_cbindgen.h

@@ -785,6 +785,7 @@ FfiOptOwnedPtr<McData> mc_transaction_builder_add_output(FfiMutPtr<McTransaction
                                                          FfiRefPtr<McPublicAddress> recipient_address,
                                                          FfiOptMutPtr<McRngCallback> rng_callback,
                                                          FfiMutPtr<McMutableBuffer> out_tx_out_confirmation_number,
+                                                         FfiMutPtr<McMutableBuffer> out_tx_out_shared_secret,
                                                          FfiOptMutPtr<FfiOptOwnedPtr<McError>> out_error);
 
 /**
@@ -806,6 +807,7 @@ FfiOptOwnedPtr<McData> mc_transaction_builder_add_change_output(FfiRefPtr<McAcco
                                                                 uint64_t amount,
                                                                 FfiOptMutPtr<McRngCallback> rng_callback,
                                                                 FfiMutPtr<McMutableBuffer> out_tx_out_confirmation_number,
+                                                                FfiMutPtr<McMutableBuffer> out_tx_out_shared_secret,
                                                                 FfiOptMutPtr<FfiOptOwnedPtr<McError>> out_error);
 
 /**

libmobilecoin/src/transaction.rs

@@ -481,6 +481,7 @@ pub extern "C" fn mc_transaction_builder_add_output(
     recipient_address: FfiRefPtr<McPublicAddress>,
     rng_callback: FfiOptMutPtr<McRngCallback>,
     out_tx_out_confirmation_number: FfiMutPtr<McMutableBuffer>,
+    out_tx_out_shared_secret: FfiMutPtr<McMutableBuffer>,
     out_error: FfiOptMutPtr<FfiOptOwnedPtr<McError>>,
 ) -> FfiOptOwnedPtr<McData> {
     ffi_boundary_with_error(out_error, || {
@@ -496,11 +497,18 @@ pub extern "C" fn mc_transaction_builder_add_output(
             .as_slice_mut_of_len(TxOutConfirmationNumber::size())
             .expect("out_tx_out_confirmation_number length is insufficient");
 
-        let (tx_out, confirmation) =
+        let tx_out_context =
             transaction_builder.add_output(amount, &recipient_address, &mut rng)?;
 
-        out_tx_out_confirmation_number.copy_from_slice(confirmation.as_ref());
-        Ok(mc_util_serial::encode(&tx_out))
+        out_tx_out_confirmation_number.copy_from_slice(tx_out_context.confirmation.as_ref());
+
+        let out_tx_out_shared_secret = out_tx_out_shared_secret
+            .into_mut()
+            .as_slice_mut_of_len(RistrettoPublic::size())
+            .expect("out_tx_out_shared_secret length is insufficient");
+
+        out_tx_out_shared_secret.copy_from_slice(&tx_out_context.shared_secret.to_bytes());
+        Ok(mc_util_serial::encode(&tx_out_context.tx_out))
     })
 }
 
@@ -523,6 +531,7 @@ pub extern "C" fn mc_transaction_builder_add_change_output(
     amount: u64,
     rng_callback: FfiOptMutPtr<McRngCallback>,
     out_tx_out_confirmation_number: FfiMutPtr<McMutableBuffer>,
+    out_tx_out_shared_secret: FfiMutPtr<McMutableBuffer>,
     out_error: FfiOptMutPtr<FfiOptOwnedPtr<McError>>,
 ) -> FfiOptOwnedPtr<McData> {
     ffi_boundary_with_error(out_error, || {
@@ -539,11 +548,18 @@ pub extern "C" fn mc_transaction_builder_add_change_output(
             .as_slice_mut_of_len(TxOutConfirmationNumber::size())
             .expect("out_tx_out_confirmation_number length is insufficient");
 
-        let (tx_out, confirmation) =
+        let tx_out_context =
             transaction_builder.add_change_output(amount, &change_destination, &mut rng)?;
 
-        out_tx_out_confirmation_number.copy_from_slice(confirmation.as_ref());
-        Ok(mc_util_serial::encode(&tx_out))
+        out_tx_out_confirmation_number.copy_from_slice(tx_out_context.confirmation.as_ref());
+
+        let out_tx_out_shared_secret = out_tx_out_shared_secret
+            .into_mut()
+            .as_slice_mut_of_len(RistrettoPublic::size())
+            .expect("out_tx_out_shared_secret length is insufficient");
+
+        out_tx_out_shared_secret.copy_from_slice(&tx_out_context.shared_secret.to_bytes());
+        Ok(mc_util_serial::encode(&tx_out_context.tx_out))
     })
 }
 

mobilecoind/src/payments.rs

@@ -25,6 +25,7 @@ use mc_transaction_core::{
 };
 use mc_transaction_std::{
     ChangeDestination, EmptyMemoBuilder, InputCredentials, MemoBuilder, TransactionBuilder,
+    TxOutContext,
 };
 use mc_util_uri::FogUri;
 use rand::Rng;
@@ -970,12 +971,16 @@ impl<T: BlockchainConnection + UserTxConnection + 'static, FPR: FogPubkeyResolve
         let mut tx_out_to_outlay_index = HashMap::default();
         let mut outlay_confirmation_numbers = Vec::default();
         for (i, outlay) in destinations.iter().enumerate() {
-            let (tx_out, confirmation_number) = tx_builder
+            let TxOutContext {
+                tx_out,
+                confirmation,
+                ..
+            } = tx_builder
                 .add_output(outlay.value, &outlay.receiver, rng)
                 .map_err(|err| Error::TxBuild(format!("failed adding output: {}", err)))?;
 
             tx_out_to_outlay_index.insert(tx_out, i);
-            outlay_confirmation_numbers.push(confirmation_number);
+            outlay_confirmation_numbers.push(confirmation);
 
             total_value += outlay.value;
         }

mobilecoind/src/service.rs

@@ -2103,7 +2103,7 @@ mod test {
         tx::{Tx, TxOut},
         Amount, Block, BlockContents, BlockVersion, Token,
     };
-    use mc_transaction_std::{EmptyMemoBuilder, MemoType, TransactionBuilder};
+    use mc_transaction_std::{EmptyMemoBuilder, MemoType, TransactionBuilder, TxOutContext};
     use mc_util_repr_bytes::{typenum::U32, GenericArray, ReprBytes};
     use mc_util_uri::FogUri;
     use rand::{rngs::StdRng, SeedableRng};
@@ -3047,7 +3047,11 @@ mod test {
             EmptyMemoBuilder::default(),
         )
         .unwrap();
-        let (tx_out, tx_confirmation) = transaction_builder
+        let TxOutContext {
+            tx_out,
+            confirmation,
+            ..
+        } = transaction_builder
             .add_output(10, &receiver.subaddress(0), &mut rng)
             .unwrap();
 
@@ -3064,7 +3068,7 @@ mod test {
             ));
             receipt.set_tx_out_hash(hash.to_vec());
             receipt.set_tombstone(10);
-            receipt.set_confirmation_number(tx_confirmation.to_vec());
+            receipt.set_confirmation_number(confirmation.to_vec());
 
             let mut request = mc_mobilecoind_api::GetTxStatusAsReceiverRequest::new();
             request.set_receipt(receipt);
@@ -5522,7 +5526,7 @@ mod test {
             EmptyMemoBuilder::default(),
         )
         .unwrap();
-        let (tx_out, _tx_confirmation) = transaction_builder
+        let TxOutContext { tx_out, .. } = transaction_builder
             .add_output(
                 10,
                 &account_key.subaddress(DEFAULT_SUBADDRESS_INDEX),
@@ -5636,7 +5640,7 @@ mod test {
             EmptyMemoBuilder::default(),
         )
         .unwrap();
-        let (tx_out, _tx_confirmation) = transaction_builder
+        let TxOutContext { tx_out, .. } = transaction_builder
             .add_output(
                 10,
                 &account_key.subaddress(DEFAULT_SUBADDRESS_INDEX),

transaction/std/src/lib.rs

@@ -23,7 +23,9 @@ pub use memo::{
     SenderMemoCredential, UnusedMemo,
 };
 pub use memo_builder::{BurnRedemptionMemoBuilder, EmptyMemoBuilder, MemoBuilder, RTHMemoBuilder};
-pub use transaction_builder::{DefaultTxOutputsOrdering, TransactionBuilder, TxOutputsOrdering};
+pub use transaction_builder::{
+    DefaultTxOutputsOrdering, TransactionBuilder, TxOutContext, TxOutputsOrdering,
+};
 
 // Re-export this to help the exported macros work
 pub use mc_transaction_core::MemoPayload;