From 1deaea802216ed18fb62fff411dae8f4175ce4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Mon, 17 Jun 2024 14:34:14 +0100 Subject: [PATCH] shielded_token: fix VP post move --- Cargo.lock | 7 +++ crates/core/src/parameters.rs | 5 ++ crates/parameters/src/lib.rs | 6 ++ crates/shielded_token/Cargo.toml | 11 ++++ crates/shielded_token/src/lib.rs | 2 + crates/shielded_token/src/vp.rs | 101 +++++++++++++++++++------------ 6 files changed, 93 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14bf2e7e2b8..4858f3aa9b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5325,18 +5325,25 @@ dependencies = [ "lazy_static", "masp_primitives", "masp_proofs", + "namada_account", "namada_controller", "namada_core", "namada_gas", "namada_parameters", + "namada_state", "namada_storage", "namada_trans_token", + "namada_tx", + "namada_vp", "proptest", "rand_core 0.6.4", "rayon", + "ripemd", "serde", + "sha2 0.9.9", "smooth-operator", "test-log", + "thiserror", "tracing", ] diff --git a/crates/core/src/parameters.rs b/crates/core/src/parameters.rs index f1e0f66af47..449ec935808 100644 --- a/crates/core/src/parameters.rs +++ b/crates/core/src/parameters.rs @@ -35,6 +35,11 @@ pub trait Read { fn epoch_duration_parameter( storage: &S, ) -> Result; + + /// Get the max signatures per transactio parameter + fn max_signatures_per_transaction( + storage: &S, + ) -> Result, Self::Err>; } /// Abstract parameters storage write interface diff --git a/crates/parameters/src/lib.rs b/crates/parameters/src/lib.rs index ed833034591..05f3a662375 100644 --- a/crates/parameters/src/lib.rs +++ b/crates/parameters/src/lib.rs @@ -61,6 +61,12 @@ where ) -> Result { read_epoch_duration_parameter(storage) } + + fn max_signatures_per_transaction( + storage: &S, + ) -> Result, Self::Err> { + max_signatures_per_transaction(storage) + } } impl Write for Store diff --git a/crates/shielded_token/Cargo.toml b/crates/shielded_token/Cargo.toml index 85d065500ac..f978807c647 100644 --- a/crates/shielded_token/Cargo.toml +++ b/crates/shielded_token/Cargo.toml @@ -28,12 +28,16 @@ testing = [ ] [dependencies] +namada_account = { path = "../account" } namada_controller = { path = "../controller" } namada_core = { path = "../core" } namada_gas = { path = "../gas", optional = true } namada_parameters = { path = "../parameters" } +namada_state = { path = "../state" } namada_storage = { path = "../storage" } namada_trans_token = { path = "../trans_token" } +namada_tx = { path = "../tx" } +namada_vp = { path = "../vp" } borsh.workspace = true lazy_static = { workspace = true, optional = true } @@ -41,15 +45,22 @@ masp_primitives.workspace = true masp_proofs = { workspace = true, optional = true, features = ["download-params"] } rand_core = { workspace = true, optional = true } rayon = { workspace = true, optional = true } +ripemd.workspace = true serde.workspace = true +sha2.workspace = true smooth-operator.workspace = true +thiserror.workspace = true tracing.workspace = true [dev-dependencies] namada_core = { path = "../core", features = ["testing"] } +namada_gas = { path = "../gas" } namada_parameters = { path = "../parameters", features = ["testing"] } namada_storage = { path = "../storage", features = ["testing"] } +lazy_static.workspace = true +masp_proofs = { workspace = true, features = ["download-params"] } proptest.workspace = true +rand_core.workspace = true rayon.workspace = true test-log.workspace = true diff --git a/crates/shielded_token/src/lib.rs b/crates/shielded_token/src/lib.rs index 625a5318f9a..b1af18b94c9 100644 --- a/crates/shielded_token/src/lib.rs +++ b/crates/shielded_token/src/lib.rs @@ -23,6 +23,8 @@ pub mod storage_key; pub mod utils; #[cfg(any(test, feature = "validation", feature = "testing"))] pub mod validation; +#[cfg(any(test, feature = "validation", feature = "testing"))] +pub mod vp; use std::str::FromStr; diff --git a/crates/shielded_token/src/vp.rs b/crates/shielded_token/src/vp.rs index 00302bfecf0..9a64855e605 100644 --- a/crates/shielded_token/src/vp.rs +++ b/crates/shielded_token/src/vp.rs @@ -2,8 +2,8 @@ use std::cmp::Ordering; use std::collections::{BTreeMap, BTreeSet}; +use std::marker::PhantomData; -use borsh_ext::BorshSerializeExt; use masp_primitives::asset_type::AssetType; use masp_primitives::merkle_tree::CommitmentTree; use masp_primitives::sapling::Node; @@ -16,33 +16,35 @@ use namada_core::address::Address; use namada_core::address::InternalAddress::Masp; use namada_core::arith::{checked, CheckedAdd, CheckedSub}; use namada_core::booleans::BoolResultUnitExt; +use namada_core::borsh::BorshSerializeExt; use namada_core::collections::HashSet; use namada_core::masp::{encode_asset_type, MaspEpoch}; use namada_core::storage::Key; +use namada_core::token::MaspDigitPos; +use namada_core::uint::I320; +use namada_core::{governance, parameters, token}; use namada_gas::GasMetering; -use namada_governance::storage::is_proposal_accepted; -use namada_state::{ConversionState, OptionExt, ResultExt, StateRead}; -use namada_token::read_denom; -use namada_token::validation::verify_shielded_tx; +use namada_state::{ + ConversionState, OptionExt, ResultExt, StateRead, StorageError, +}; +use namada_trans_token::read_denom; +use namada_trans_token::storage_key::{ + is_any_shielded_action_balance_key, ShieldedActionOwner, +}; use namada_tx::BatchedTxRef; -use namada_vp_env::VpEnv; +use namada_vp::native_vp::{Ctx, CtxPreStorageRead, NativeVp, VpEvaluator}; +use namada_vp::{native_vp, VpEnv}; use ripemd::Digest as RipemdDigest; use sha2::Digest as Sha2Digest; use thiserror::Error; -use token::storage_key::{ - is_any_shielded_action_balance_key, is_masp_key, is_masp_nullifier_key, - is_masp_token_map_key, is_masp_transfer_key, masp_commitment_anchor_key, - masp_commitment_tree_key, masp_convert_anchor_key, masp_nullifier_key, - ShieldedActionOwner, -}; use token::Amount; -use crate::ledger::native_vp; -use crate::ledger::native_vp::{Ctx, NativeVp}; -use crate::token; -use crate::token::MaspDigitPos; -use crate::uint::I320; -use crate::vm::WasmCacheAccess; +use crate::storage_key::{ + is_masp_key, is_masp_nullifier_key, is_masp_token_map_key, + is_masp_transfer_key, masp_commitment_anchor_key, masp_commitment_tree_key, + masp_convert_anchor_key, masp_nullifier_key, +}; +use crate::validation::verify_shielded_tx; #[allow(missing_docs)] #[derive(Error, Debug)] @@ -55,13 +57,17 @@ pub enum Error { pub type Result = std::result::Result; /// MASP VP -pub struct MaspVp<'a, S, CA> +pub struct MaspVp<'a, S, CA, EVAL, Params, Gov> where - S: StateRead, - CA: WasmCacheAccess, + S: 'static + StateRead, + EVAL: VpEvaluator<'a, S, CA, EVAL>, { /// Context to interact with the host structures. - pub ctx: Ctx<'a, S, CA>, + pub ctx: Ctx<'a, S, CA, EVAL>, + /// Governance type + pub gov: PhantomData, + /// Parameters type + pub params: PhantomData, } // The balances changed by the transaction, split between masp and non-masp @@ -77,14 +83,23 @@ struct ChangedBalances { post: BTreeMap>, } -impl<'a, S, CA> MaspVp<'a, S, CA> +impl<'a, S, CA, EVAL, Params, Gov> MaspVp<'a, S, CA, EVAL, Params, Gov> where - S: StateRead, - CA: 'static + WasmCacheAccess, + S: 'static + StateRead, + CA: 'static + Clone, + EVAL: 'static + VpEvaluator<'a, S, CA, EVAL>, + Params: parameters::Read< + CtxPreStorageRead<'a, 'a, S, CA, EVAL>, + Err = StorageError, + >, + Gov: governance::Read< + CtxPreStorageRead<'a, 'a, S, CA, EVAL>, + Err = StorageError, + >, { /// Return if the parameter change was done via a governance proposal pub fn is_valid_parameter_change( - &self, + &'a self, tx: &BatchedTxRef<'_>, ) -> Result<()> { tx.tx.data(tx.cmt).map_or_else( @@ -95,7 +110,7 @@ where .into()) }, |data| { - is_proposal_accepted(&self.ctx.pre(), data.as_ref()) + Gov::is_proposal_accepted(&self.ctx.pre(), data.as_ref()) .map_err(Error::NativeVpError)? .ok_or_else(|| { native_vp::Error::new_const( @@ -244,7 +259,7 @@ where // Check that the convert descriptions anchors of a transaction are valid fn valid_convert_descriptions_anchor( - &self, + &'a self, transaction: &Transaction, ) -> Result<()> { if let Some(bundle) = transaction.sapling_bundle() { @@ -343,7 +358,7 @@ where // Check that MASP Transaction and state changes are valid fn is_valid_masp_transfer( - &self, + &'a self, tx_data: &BatchedTxRef<'_>, keys_changed: &BTreeSet, ) -> Result<()> { @@ -489,17 +504,15 @@ where // Otherwise the signer must be decodable so that we can // manually check the signatures let public_keys_index_map = - crate::account::public_keys_index_map( + namada_account::public_keys_index_map( &self.ctx.pre(), signer, )?; let threshold = - crate::account::threshold(&self.ctx.pre(), signer)? + namada_account::threshold(&self.ctx.pre(), signer)? .unwrap_or(1); let max_signatures_per_transaction = - crate::parameters::max_signatures_per_transaction( - &self.ctx.pre(), - )?; + Params::max_signatures_per_transaction(&self.ctx.pre())?; let mut gas_meter = self.ctx.gas_meter.borrow_mut(); tx_data .tx @@ -509,7 +522,7 @@ where &Some(signer.clone()), threshold, max_signatures_per_transaction, - || gas_meter.consume(crate::gas::VERIFY_TX_SIG_GAS), + || gas_meter.consume(namada_gas::VERIFY_TX_SIG_GAS), ) .map_err(native_vp::Error::new)?; } else { @@ -830,15 +843,25 @@ fn verify_sapling_balancing_value( } } -impl<'a, S, CA> NativeVp for MaspVp<'a, S, CA> +impl<'a, S, CA, EVAL, Params, Gov> NativeVp<'a> + for MaspVp<'a, S, CA, EVAL, Params, Gov> where - S: StateRead, - CA: 'static + WasmCacheAccess, + S: 'static + StateRead, + CA: 'static + Clone, + EVAL: 'static + VpEvaluator<'a, S, CA, EVAL>, + Params: parameters::Read< + CtxPreStorageRead<'a, 'a, S, CA, EVAL>, + Err = StorageError, + >, + Gov: governance::Read< + CtxPreStorageRead<'a, 'a, S, CA, EVAL>, + Err = StorageError, + >, { type Error = Error; fn validate_tx( - &self, + &'a self, tx_data: &BatchedTxRef<'_>, keys_changed: &BTreeSet, _verifiers: &BTreeSet
,