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.

Sign up for GitHub

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

Remove UtxoAccumulator from MantaSbt #1125

Merged
merged 5 commits into from
Jun 1, 2023
Merged

Remove UtxoAccumulator from MantaSbt #1125

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da57960
remove UtxoAccumulator
ferrell-code May 25, 2023
5bfb6f2
Merge branch 'manta' into fer-remove-utxo-acc
ferrell-code May 26, 2023
f2da657
Merge branch 'manta' into fer-remove-utxo-acc
ferrell-code May 30, 2023
e4da782
Merge branch 'manta' into fer-remove-utxo-acc
ferrell-code May 31, 2023
9a4c291
Merge branch 'manta' into fer-remove-utxo-acc
ghzlatarev Jun 1, 2023
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
21 changes: 5 additions & 16 deletions pallets/manta-sbt/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ use frame_system::pallet_prelude::*;
use manta_support::manta_pay::{
asset_value_encode, fp_decode, fp_encode, id_from_field, AccountId, AssetValue, Checkpoint,
FullIncomingNote, MTParametersError, Proof, PullResponse, ReceiverChunk, StandardAssetId,
TransferPost, Utxo, UtxoAccumulatorOutput, UtxoItemHashError, UtxoMerkleTreePath,
VerifyingContextError, Wrap, WrapPair,
TransferPost, Utxo, UtxoItemHashError, UtxoMerkleTreePath, VerifyingContextError, Wrap,
WrapPair,
};
use sha3::{Digest, Keccak256};
use sp_core::{H160, H256, U256};
Expand Down Expand Up @@ -295,11 +295,6 @@ pub mod pallet {
pub(super) type ShardTrees<T: Config> =
StorageMap<_, Twox64Concat, u8, UtxoMerkleTreePath, ValueQuery>;

/// Outputs of Utxo Accumulator
#[pallet::storage]
ghzlatarev marked this conversation as resolved.
Show resolved Hide resolved
pub(super) type UtxoAccumulatorOutputs<T: Config> =
StorageMap<_, Twox64Concat, UtxoAccumulatorOutput, (), ValueQuery>;

#[pallet::call]
impl<T: Config> Pallet<T>
where
Expand Down Expand Up @@ -1193,12 +1188,10 @@ where
// NOTE: Checking for an empty(zeroed) byte array. This happens for UTXOs with `value = 0`,
// for which you don't need a membership proof, but you still need a root (in this case
// zeroed).
if accumulator_output == [0u8; 32]
|| UtxoAccumulatorOutputs::<T>::contains_key(accumulator_output)
{
if accumulator_output == [0u8; 32] {
return Ok(Wrap(output));
}
Err(SenderLedgerError::InvalidUtxoAccumulatorOutput)
Err(SenderLedgerError::NoSenderLedger)
}

#[inline]
Expand Down Expand Up @@ -1314,12 +1307,8 @@ where
tree.leaf_digest = leaf_digest
.map(|x| fp_encode(x).map_err(ReceiverLedgerError::FpEncodeError))
.map_or(Ok(None), |r| r.map(Some))?;
if let Some(next_root) = next_root {
if let Some(_next_root) = next_root {
ShardTrees::<T>::insert(shard_index, tree);
UtxoAccumulatorOutputs::<T>::insert(
fp_encode(next_root).map_err(ReceiverLedgerError::FpEncodeError)?,
(),
);
}
}
Ok(())
Expand Down