Skip to content

Commit

Permalink
fixup! Merge branch 'murisi/masp-fixes' (#2371)
Browse files Browse the repository at this point in the history
  • Loading branch information
tzemanovic committed Jan 12, 2024
1 parent 17d38c5 commit a7fab85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sdk/src/masp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ use namada_core::types::masp::{
use namada_core::types::storage::{BlockHeight, Epoch, IndexedTx, TxIndex};
use namada_core::types::time::{DateTimeUtc, DurationSecs};
use namada_core::types::token;
use namada_core::types::token::{Change, MaspDenom, Transfer};
use namada_core::types::token::{MaspDenom, Transfer};
use namada_core::types::transaction::{TxResult, WrapperTx};
use rand_core::{CryptoRng, OsRng, RngCore};
use ripemd::Digest as RipemdDigest;
Expand Down
2 changes: 1 addition & 1 deletion shared/src/ledger/native_vp/masp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use namada_core::ledger::vp_env::VpEnv;
use namada_core::proto::Tx;
use namada_core::types::address::Address;
use namada_core::types::address::InternalAddress::Masp;
use namada_core::types::storage::{Epoch, IndexedTx, Key};
use namada_core::types::storage::{IndexedTx, Key};
use namada_core::types::token::{
self, is_masp_allowed_key, is_masp_key, is_masp_nullifier_key,
masp_pin_tx_key,
Expand Down

0 comments on commit a7fab85

Please sign in to comment.