trans_token: env agnostic VP

anoma · Sep 12, 2024 · a75ad66 · a75ad66
1 parent bc62e43
commit a75ad66
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 147 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/benches/native_vps.rs b/crates/benches/native_vps.rs
@@ -513,7 +513,7 @@ fn vp_multitoken(c: &mut Criterion) {
         let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
             &TxGasMeter::new(u64::MAX),
         ));
-        let multitoken = MultitokenVp::new(Ctx::new(
+        let ctx = Ctx::new(
             &Address::Internal(InternalAddress::Multitoken),
             &shell.state,
             &signed_tx.tx,
@@ -523,18 +523,18 @@ fn vp_multitoken(c: &mut Criterion) {
             &keys_changed,
             &verifiers,
             shell.vp_wasm_cache.clone(),
-        ));
+        );
 
         group.bench_function(bench_name, |b| {
             b.iter(|| {
                 assert!(
-                    multitoken
-                        .validate_tx(
-                            &signed_tx.to_ref(),
-                            multitoken.ctx.keys_changed,
-                            multitoken.ctx.verifiers,
-                        )
-                        .is_ok()
+                    MultitokenVp::validate_tx(
+                        &ctx,
+                        &signed_tx.to_ref(),
+                        ctx.keys_changed,
+                        ctx.verifiers,
+                    )
+                    .is_ok()
                 )
             })
         });

diff --git a/crates/node/src/protocol.rs b/crates/node/src/protocol.rs
@@ -1266,14 +1266,13 @@ where
                             )
                             .map_err(Error::NativeVpError),
                             InternalAddress::Multitoken => {
-                                let multitoken = MultitokenVp::new(ctx);
-                                multitoken
-                                    .validate_tx(
-                                        batched_tx,
-                                        &keys_changed,
-                                        &verifiers,
-                                    )
-                                    .map_err(Error::NativeVpError)
+                                MultitokenVp::validate_tx(
+                                    &ctx,
+                                    batched_tx,
+                                    &keys_changed,
+                                    &verifiers,
+                                )
+                                .map_err(Error::NativeVpError)
                             }
                             InternalAddress::Masp => {
                                 let masp = MaspVp::new(ctx);

diff --git a/crates/sdk/src/validation.rs b/crates/sdk/src/validation.rs
@@ -68,13 +68,11 @@ pub type GovernanceVp<'ctx, CTX> = governance::vp::GovernanceVp<
 pub type PgfVp<'ctx, CTX> = governance::vp::pgf::PgfVp<'ctx, CTX>;
 
 /// Native multitoken VP
-pub type MultitokenVp<'a, S, CA> = token::vp::MultitokenVp<
-    'a,
-    S,
-    VpCache<CA>,
-    Eval<S, CA>,
-    ParamsPreStore<'a, S, CA>,
-    GovPreStore<'a, S, CA>,
+pub type MultitokenVp<'ctx, CTX> = token::vp::MultitokenVp<
+    'ctx,
+    CTX,
+    parameters::Store<<CTX as VpEnv<'ctx>>::Pre>,
+    governance::Store<<CTX as VpEnv<'ctx>>::Pre>,
 >;
 
 /// Native MASP VP

diff --git a/crates/tests/src/vm_host_env/ibc.rs b/crates/tests/src/vm_host_env/ibc.rs
@@ -77,6 +77,7 @@ use namada_sdk::{ibc, proof_of_stake, token};
 use namada_test_utils::TestWasms;
 use namada_tx_env::TxEnv;
 use namada_tx_prelude::BorshSerializeExt;
+use namada_vm::wasm::run::VpEvalWasm;
 use namada_vm::{wasm, WasmCacheRwAccess};
 use namada_vp::native_vp;
 use namada_vp::native_vp::{Ctx, NativeVp};
@@ -100,20 +101,6 @@ impl<'a> TestIbcVp<'a> {
     }
 }
 
-pub struct TestMultitokenVp<'a> {
-    pub multitoken_vp: MultitokenVp<'a, TestState, WasmCacheRwAccess>,
-}
-
-impl<'a> TestMultitokenVp<'a> {
-    pub fn validate(&self, batched_tx: &BatchedTxRef) -> native_vp::Result<()> {
-        self.multitoken_vp.validate_tx(
-            batched_tx,
-            self.multitoken_vp.ctx.keys_changed,
-            self.multitoken_vp.ctx.verifiers,
-        )
-    }
-}
-
 /// Validate an IBC transaction with IBC VP.
 pub fn validate_ibc_vp_from_tx<'a>(
     tx_env: &'a TestTxEnv,
@@ -170,12 +157,12 @@ pub fn validate_multitoken_vp_from_tx<'a>(
         );
     }
     let (vp_wasm_cache, _vp_cache_dir) =
-        wasm::compilation_cache::common::testing::cache();
+        wasm::compilation_cache::common::testing::vp_cache();
 
     let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
         &TxGasMeter::new(10_000_000_000),
     ));
-    let ctx = Ctx::new(
+    let ctx = Ctx::<_, _, VpEvalWasm<_, _, _>>::new(
         &ADDRESS,
         &tx_env.state,
         batched_tx.tx,
@@ -186,9 +173,8 @@ pub fn validate_multitoken_vp_from_tx<'a>(
         &verifiers,
         vp_wasm_cache,
     );
-    let multitoken_vp = MultitokenVp::new(ctx);
 
-    TestMultitokenVp { multitoken_vp }.validate(batched_tx)
+    MultitokenVp::validate_tx(&ctx, batched_tx, ctx.keys_changed, ctx.verifiers)
 }
 
 /// Initialize the test storage. Requires initialized [`tx_host_env::ENV`].

diff --git a/crates/trans_token/Cargo.toml b/crates/trans_token/Cargo.toml
@@ -24,7 +24,7 @@ namada_events = { path = "../events", default-features = false }
 namada_state = { path = "../state" }
 namada_systems = { path = "../systems" }
 namada_tx = { path = "../tx" }
-namada_vp = { path = "../vp" }
+namada_vp_env = { path = "../vp_env" }
 
 konst.workspace = true
 linkme = {workspace =  true, optional = true}
@@ -40,5 +40,6 @@ namada_parameters = { path = "../parameters", features = ["testing"] }
 namada_state = { path = "../state", features = ["testing"] }
 namada_tx = { path = "../tx", features = ["testing"] }
 namada_vm = { path = "../vm", features = ["testing"] }
+namada_vp = { path = "../vp" }
 
 assert_matches.workspace = true