Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into release/v1.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
briancorbin committed Aug 19, 2022
2 parents e3d0a3f + 1304ee6 commit 8fd5797
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions full-service/src/service/gift_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use crate::{
service::{
account::AccountServiceError,
address::{AddressService, AddressServiceError},
ledger::LedgerService,
models::tx_proposal::TxProposal,
transaction::{TransactionMemo, TransactionService, TransactionServiceError},
transaction_builder::DEFAULT_NEW_TX_BLOCK_ATTEMPTS,
Expand Down Expand Up @@ -45,7 +46,7 @@ use mc_transaction_core::{
ring_signature::KeyImage,
tokens::Mob,
tx::{Tx, TxOut},
Amount, BlockVersion, Token,
Amount, Token,
};
use mc_transaction_std::{
InputCredentials, RTHMemoBuilder, SenderMemoCredential, TransactionBuilder,
Expand Down Expand Up @@ -695,7 +696,7 @@ where
let mut memo_builder = RTHMemoBuilder::default();
memo_builder.set_sender_credential(SenderMemoCredential::from(&gift_account_key));
memo_builder.enable_destination_memo();
let block_version = BlockVersion::MAX;
let block_version = self.get_network_block_version();
let fee = Amount::new(Mob::MINIMUM_FEE, Mob::ID);
let mut transaction_builder =
TransactionBuilder::new(block_version, fee, fog_resolver, memo_builder)?;
Expand Down

0 comments on commit 8fd5797

Please sign in to comment.