Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions base_layer/wallet/src/output_manager_service/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ pub enum OutputManagerRequest {
fee_per_gram: MicroMinotari,
lock_height: Option<u64>,
payment_id: MemoField,
minimum_value_promise: MicroMinotari,
},
CreatePayToSelfWithOutputs {
outputs: Vec<WalletOutputBuilder>,
Expand Down Expand Up @@ -916,6 +917,7 @@ where KM: TransactionKeyManagerInterface
fee_per_gram: MicroMinotari,
lock_height: Option<u64>,
payment_id: MemoField,
minimum_value_promise: MicroMinotari,
) -> Result<(MicroMinotari, Transaction), OutputManagerError> {
match self
.handle
Expand All @@ -927,6 +929,7 @@ where KM: TransactionKeyManagerInterface
fee_per_gram,
lock_height,
payment_id,
minimum_value_promise,
})
.await??
{
Expand Down
9 changes: 8 additions & 1 deletion base_layer/wallet/src/output_manager_service/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ where
fee_per_gram,
lock_height,
payment_id,
minimum_value_promise,
} => self
.create_pay_to_self_transaction(
tx_id,
Expand All @@ -379,6 +380,7 @@ where
fee_per_gram,
lock_height,
payment_id,
minimum_value_promise,
)
.await
.map(OutputManagerResponse::PayToSelfTransaction),
Expand Down Expand Up @@ -1638,6 +1640,7 @@ where
fee_per_gram: MicroMinotari,
lock_height: Option<u64>,
payment_id: MemoField,
minimum_value_promise: MicroMinotari,
) -> Result<(MicroMinotari, Transaction), OutputManagerError> {
let covenant = Covenant::default();

Expand Down Expand Up @@ -1691,6 +1694,7 @@ where
covenant,
payment_id,
input_selection.as_final_fee(),
minimum_value_promise,
)
.await?;

Expand Down Expand Up @@ -2165,6 +2169,7 @@ where
Covenant::default(),
MemoField::open_from_string(&format!("{number_of_splits} even coin splits"), TxType::CoinSplit),
fee,
MicroMinotari::zero(),
)
.await?;

Expand Down Expand Up @@ -2325,6 +2330,7 @@ where
Covenant::default(),
payment_id.clone(),
final_fee,
MicroMinotari::zero(),
)
.await?;

Expand Down Expand Up @@ -2399,6 +2405,7 @@ where
covenant: Covenant,
payment_id: MemoField,
fee: MicroMinotari,
minimum_value_promise: MicroMinotari,
) -> Result<(DbWalletOutput, TariKeyId), OutputManagerError> {
let (commitment_mask_key, script_key) = self
.resources
Expand All @@ -2420,7 +2427,6 @@ where
.key_manager
.encrypt_data_for_recovery(&commitment_mask_key.key_id, None, amount.as_u64(), payment_id.clone())
.await?;
let minimum_value_promise = MicroMinotari::zero();
let metadata_message = TransactionOutput::metadata_signature_message_from_parts(
&TransactionOutputVersion::get_current_version(),
&script,
Expand Down Expand Up @@ -2548,6 +2554,7 @@ where
Covenant::default(),
payment_id.clone(),
fee,
MicroMinotari::zero(),
)
.await?;

Expand Down
6 changes: 6 additions & 0 deletions base_layer/wallet/src/transaction_service/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2099,6 +2099,9 @@ where
fee_per_gram,
None,
payment_id.clone(),
// Set minimum value promise to the amount provided. VN Reg outputs are required by validation to use
// this.
amount,
)
.await?;

Expand Down Expand Up @@ -2183,6 +2186,7 @@ where
fee_per_gram,
None,
payment_id.clone(),
MicroMinotari::zero(),
)
.await?;

Expand Down Expand Up @@ -2257,6 +2261,7 @@ where
fee_per_gram,
None,
payment_id.clone(),
MicroMinotari::zero(),
)
.await?;

Expand Down Expand Up @@ -2371,6 +2376,7 @@ where
fee_per_gram,
None,
payment_id.clone(),
MicroMinotari::zero(),
)
.await?;
let template_output = transaction
Expand Down
Loading