updating comsig creation, attempt to get working

controller/src/command.rs

@@ -1671,6 +1671,7 @@ impl ContractNewArgs {
 				net_change: Some(net_change),
 				num_participants: self.num_participants,
 				add_outputs: self.add_outputs,
+				delete_context_on_final_sign: true,
 				selection_args: OutputSelectionArgs {
 					use_inputs: match self.use_inputs.as_ref() {
 						Some(v) => Some(v.to_string()),

controller/tests/contract_srs_mwmixnet.rs

@@ -74,6 +74,7 @@ fn contract_srs_mwixnet_tx_impl(test_dir: &'static str) -> Result<(), libwallet:
 	// Send wallet finalizes and posts
 	wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| {
 		let args = &mut ContractSetupArgsAPI {
+			delete_context_on_final_sign: false,
 			..Default::default()
 		};
 		args.proof_args.suppress_proof = true;

libwallet/src/contract/actions/new.rs

@@ -45,6 +45,7 @@ where
 		&mut context,
 		setup_args.add_outputs,
 		false,
+		setup_args.delete_context_on_final_sign,
 	)?;
 
 	Ok(slate)

libwallet/src/contract/actions/revoke.rs

@@ -73,6 +73,7 @@ where
 			net_change: Some(0), // self-spend
 			num_participants: 1,
 			add_outputs: false,
+			delete_context_on_final_sign: true,
 			selection_args: OutputSelectionArgs {
 				use_inputs: Some(String::from(input_commit)),
 				..Default::default()
@@ -90,6 +91,7 @@ where
 			net_change: None, // we already have it in the context as 0 now
 			num_participants: 1,
 			add_outputs: false,
+			delete_context_on_final_sign: true,
 			selection_args: OutputSelectionArgs {
 				use_inputs: Some(String::from(input_commit)),
 				..Default::default()

libwallet/src/contract/actions/setup.rs

@@ -46,6 +46,7 @@ where
 		&mut context,
 		setup_args.add_outputs,
 		false,
+		setup_args.delete_context_on_final_sign,
 	)?;
 
 	Ok(slate)

libwallet/src/contract/actions/sign.rs

@@ -44,7 +44,15 @@ where
 	let (sl, mut context) = compute(w, keychain_mask, slate, setup_args)?;
 
 	// Atomically commit state
-	contract::utils::save_step(w, keychain_mask, &sl, &mut context, will_add_outputs, true)?;
+	contract::utils::save_step(
+		w,
+		keychain_mask,
+		&sl,
+		&mut context,
+		will_add_outputs,
+		true,
+		setup_args.delete_context_on_final_sign,
+	)?;
 
 	Ok(sl)
 }

libwallet/src/contract/types.rs

@@ -137,6 +137,8 @@ pub struct ContractSetupArgsAPI {
 	pub add_outputs: bool,
 	/// Output selection arguments
 	pub selection_args: OutputSelectionArgs,
+	/// If false, don't delete context when finalizing (to facilitate mwixnet transactions)
+	pub delete_context_on_final_sign: bool,
 	/// Proof arguments
 	pub proof_args: ProofArgs,
 }
@@ -148,6 +150,7 @@ impl Default for ContractSetupArgsAPI {
 			net_change: None,
 			num_participants: 2,
 			add_outputs: false,
+			delete_context_on_final_sign: true,
 			selection_args: OutputSelectionArgs {
 				..Default::default()
 			},
@@ -177,6 +180,7 @@ impl Default for ContractNewArgsAPI {
 				net_change: None,
 				num_participants: 2,
 				add_outputs: false,
+				delete_context_on_final_sign: true,
 				selection_args: OutputSelectionArgs {
 					..Default::default()
 				},

libwallet/src/contract/utils.rs

@@ -24,6 +24,7 @@ use crate::types::{Context, NodeClient, StoredProofInfo, TxLogEntryType, WalletB
 use crate::util::OnionV3Address;
 use crate::{address, Error, OutputData, OutputStatus, TxLogEntry};
 use grin_core::core::FeeFields;
+use grin_util::file::delete;
 use uuid::Uuid;
 
 /// Creates an initial TxLogEntry without input/output or kernel information
@@ -188,6 +189,7 @@ pub fn save_step<'a, T: ?Sized, C, K>(
 	context: &mut Context,
 	step_added_outputs: bool,
 	is_signed: bool,
+	delete_on_final: bool,
 ) -> Result<(), Error>
 where
 	T: WalletBackend<'a, C, K>,
@@ -276,7 +278,7 @@ where
 	}
 
 	// Update context
-	if is_signed && !is_step2 {
+	if is_signed && !is_step2 && delete_on_final {
 		// NOTE: We MUST forget the context when we sign. Ideally, these two would be atomic or perhaps
 		// when we call slate::sigadd_partial_signaturen we could swap the secret key with a temporary one just to be safe.
 		// The reason we don't delete if we are at step2 is because in case we want to do safe cancel,