Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MASP vp multiple txs #2690

Closed
wants to merge 18 commits into from
Closed
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
2 changes: 2 additions & 0 deletions .changelog/unreleased/bug-fixes/2621-fix-nullifier-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fixed a bug in the masp vp that allowed a shielding transaction to reveal
nullifiers. ([\#2621](https://github.com/anoma/namada/pull/2621))
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/2690-multi-tx-masp-vp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Updated the masp vp to accept multiple transfers in a single transaction.
([\#2690](https://github.com/anoma/namada/pull/2690))
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use namada_tx::Tx;
use crate::address::{Address, InternalAddress};
use crate::eth_bridge_pool::{PendingTransfer, TransferToEthereumKind};
use crate::ethereum_events::EthAddress;
use crate::ledger::native_vp::{Ctx, NativeVp, StorageReader};
use crate::ledger::native_vp::{Ctx, NativeVp, SignedAmount, StorageReader};
use crate::storage::Key;
use crate::token::storage_key::balance_key;
use crate::token::Amount;
Expand All @@ -43,13 +43,6 @@ use crate::vm::WasmCacheAccess;
/// Generic error that may be returned by the validity predicate
pub struct Error(#[from] eyre::Error);

/// A positive or negative amount
#[derive(Copy, Clone)]
enum SignedAmount {
Positive(Amount),
Negative(Amount),
}

/// An [`Amount`] that has been updated with some delta value.
#[derive(Copy, Clone)]
struct AmountDelta {
Expand Down
Loading
Loading