eth/bridge_pool: env agnostic VP

anoma · Sep 12, 2024 · c812120 · c812120
1 parent 5db5b2d
commit c812120
Show file tree

Hide file tree

Showing 9 changed files with 228 additions and 272 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/benches/native_vps.rs b/crates/benches/native_vps.rs
@@ -1490,7 +1490,7 @@ fn eth_bridge_pool(c: &mut Criterion) {
     let vp_address = Address::Internal(InternalAddress::EthBridgePool);
     let gas_meter =
         RefCell::new(VpGasMeter::new_from_tx_meter(&TxGasMeter::new(u64::MAX)));
-    let bridge_pool = EthBridgePoolVp::new(Ctx::new(
+    let ctx = Ctx::new(
         &vp_address,
         &shell.state,
         &signed_tx.tx,
@@ -1500,18 +1500,18 @@ fn eth_bridge_pool(c: &mut Criterion) {
         &keys_changed,
         &verifiers,
         shell.vp_wasm_cache.clone(),
-    ));
+    );
 
     c.bench_function("vp_eth_bridge_pool", |b| {
         b.iter(|| {
             assert!(
-                bridge_pool
-                    .validate_tx(
-                        &signed_tx.to_ref(),
-                        bridge_pool.ctx.keys_changed,
-                        bridge_pool.ctx.verifiers,
-                    )
-                    .is_ok()
+                EthBridgePoolVp::validate_tx(
+                    &ctx,
+                    &signed_tx.to_ref(),
+                    ctx.keys_changed,
+                    ctx.verifiers,
+                )
+                .is_ok()
             )
         })
     });

diff --git a/crates/ethereum_bridge/Cargo.toml b/crates/ethereum_bridge/Cargo.toml
@@ -42,6 +42,7 @@ namada_trans_token = {path = "../trans_token"}
 namada_tx = {path = "../tx"}
 namada_vote_ext = {path = "../vote_ext"}
 namada_vp = {path = "../vp"}
+namada_vp_env = {path = "../vp_env"}
 
 borsh.workspace = true
 ethers.workspace = true