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

Jump to bottom

only trigger VPs from a fst addr of a key segment #2928

Merged
merged 4 commits into from
Apr 12, 2024
Merged

only trigger VPs from a fst addr of a key segment #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aaeb67
state/write_log: only trigger VPs from a fst addr of a key segment
tzemanovic Mar 20, 2024
2550d2d
wasm/tx: insert_verifier from txs where needed
tzemanovic Mar 20, 2024
c9ed295
benches: fix VPs exec to include verifiers from tx
tzemanovic Mar 22, 2024
38c9cc2
changelog: add #2928
tzemanovic Mar 22, 2024
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
3 changes: 3 additions & 0 deletions .changelog/unreleased/bug-fixes/2928-fst-addr-vps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Only use addresses from first storage key segments to
determine which VPs should be triggered by storage changes.
([\#2928](https://github.com/anoma/namada/pull/2928))
5 changes: 3 additions & 2 deletions crates/apps/src/lib/bench_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@
self.generate_ibc_tx(TX_IBC_WASM, msg)
}

pub fn execute_tx(&mut self, tx: &Tx) {
/// Execute the tx and retur a set of verifiers inserted by the tx.
pub fn execute_tx(&mut self, tx: &Tx) -> BTreeSet<Address> {

Check warning on line 391 in crates/apps/src/lib/bench_utils.rs

View check run for this annotation

Codecov / codecov/patch

crates/apps/src/lib/bench_utils.rs#L391 

Added line #L391 was not covered by tests
let gas_meter =
RefCell::new(TxGasMeter::new_from_sub_limit(u64::MAX.into()));
run::tx(
Expand All @@ -398,7 +399,7 @@
&mut self.inner.vp_wasm_cache,
&mut self.inner.tx_wasm_cache,
)
.unwrap();
.unwrap()

Check warning on line 402 in crates/apps/src/lib/bench_utils.rs

View check run for this annotation

Codecov / codecov/patch

crates/apps/src/lib/bench_utils.rs#L402 

Added line #L402 was not covered by tests
}

pub fn advance_epoch(&mut self) {
Expand Down
78 changes: 41 additions & 37 deletions crates/benches/native_vps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,12 @@ fn governance(c: &mut Criterion) {
};

// Run the tx to validate
shell.execute_tx(&signed_tx);
let verifiers_from_tx = shell.execute_tx(&signed_tx);

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -265,12 +265,12 @@ fn governance(c: &mut Criterion) {
// let mut shell = BenchShell::default();

// // Run the tx to validate
// shell.execute_tx(&tx);
// let verifiers_from_tx = shell.execute_tx(&tx);

// let (verifiers, keys_changed) = shell
// .state
// .write_log
// .verifiers_and_changed_keys(&BTreeSet::default());
// .verifiers_and_changed_keys(&verifiers_from_tx);

// let slash_fund = SlashFundVp {
// ctx: Ctx::new(
Expand Down Expand Up @@ -367,11 +367,11 @@ fn ibc(c: &mut Criterion) {
_ => panic!("Unexpected bench test"),
}

shell.execute_tx(signed_tx);
let verifiers_from_tx = shell.execute_tx(signed_tx);
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -435,11 +435,11 @@ fn vp_multitoken(c: &mut Criterion) {
.zip(["foreign_key_write", "transfer"])
{
let mut shell = BenchShell::default();
shell.execute_tx(signed_tx);
let verifiers_from_tx = shell.execute_tx(signed_tx);
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -475,10 +475,11 @@ fn vp_multitoken(c: &mut Criterion) {
}
}

// Generate and run masp transaction to be verified
// Generate and run masp transaction to be verified. Returns the verifier set
// from tx and the tx.
fn setup_storage_for_masp_verification(
bench_name: &str,
) -> (BenchShieldedCtx, Tx) {
) -> (BenchShieldedCtx, BTreeSet<Address>, Tx) {
let amount = Amount::native_whole(500);
let mut shielded_ctx = BenchShieldedCtx::default();

Expand All @@ -504,6 +505,7 @@ fn setup_storage_for_masp_verification(
TransferSource::Address(defaults::albert_address()),
TransferTarget::PaymentAddress(albert_payment_addr),
);

shielded_ctx.shell.execute_tx(&shield_tx);
shielded_ctx.shell.commit_masp_tx(shield_tx);

Expand Down Expand Up @@ -535,23 +537,23 @@ fn setup_storage_for_masp_verification(
),
_ => panic!("Unexpected bench test"),
};
shielded_ctx.shell.execute_tx(&signed_tx);
let verifiers_from_tx = shielded_ctx.shell.execute_tx(&signed_tx);

(shielded_ctx, signed_tx)
(shielded_ctx, verifiers_from_tx, signed_tx)
}

fn masp(c: &mut Criterion) {
let mut group = c.benchmark_group("vp_masp");

for bench_name in ["shielding", "unshielding", "shielded"] {
group.bench_function(bench_name, |b| {
let (shielded_ctx, signed_tx) =
let (shielded_ctx, verifiers_from_tx, signed_tx) =
setup_storage_for_masp_verification(bench_name);
let (verifiers, keys_changed) = shielded_ctx
.shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -592,7 +594,7 @@ fn masp_verify_shielded_tx(c: &mut Criterion) {

for bench_name in ["shielding", "unshielding", "shielded"] {
group.bench_function(bench_name, |b| {
let (_, signed_tx) =
let (_, _verifiers_from_tx, signed_tx) =
setup_storage_for_masp_verification(bench_name);

let transaction = signed_tx
Expand Down Expand Up @@ -663,12 +665,12 @@ fn pgf(c: &mut Criterion) {
};

// Run the tx to validate
shell.execute_tx(&signed_tx);
let verifiers_from_tx = shell.execute_tx(&signed_tx);

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -735,12 +737,12 @@ fn eth_bridge_nut(c: &mut Criterion) {
};

// Run the tx to validate
shell.execute_tx(&signed_tx);
let verifiers_from_tx = shell.execute_tx(&signed_tx);

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let vp_address =
Address::Internal(InternalAddress::Nut(native_erc20_addres));
Expand Down Expand Up @@ -806,12 +808,12 @@ fn eth_bridge(c: &mut Criterion) {
};

// Run the tx to validate
shell.execute_tx(&signed_tx);
let verifiers_from_tx = shell.execute_tx(&signed_tx);

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let vp_address = Address::Internal(InternalAddress::EthBridge);
let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
Expand Down Expand Up @@ -902,12 +904,12 @@ fn eth_bridge_pool(c: &mut Criterion) {
};

// Run the tx to validate
shell.execute_tx(&signed_tx);
let verifiers_from_tx = shell.execute_tx(&signed_tx);

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let vp_address = Address::Internal(InternalAddress::EthBridgePool);
let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
Expand Down Expand Up @@ -949,12 +951,12 @@ fn parameters(c: &mut Criterion) {
for bench_name in ["foreign_key_write", "parameter_change"] {
let mut shell = BenchShell::default();

let signed_tx = match bench_name {
let (verifiers_from_tx, signed_tx) = match bench_name {
"foreign_key_write" => {
let tx = generate_foreign_key_tx(&defaults::albert_keypair());
// Run the tx to validate
shell.execute_tx(&tx);
tx
let verifiers_from_tx = shell.execute_tx(&tx);
(verifiers_from_tx, tx)
}
"parameter_change" => {
// Simulate governance proposal to modify a parameter
Expand All @@ -971,15 +973,16 @@ fn parameters(c: &mut Criterion) {
namada::tx::data::DecryptedTx::Decrypted,
));
tx.set_data(namada::tx::Data::new(borsh::to_vec(&0).unwrap()));
tx
let verifiers_from_tx = BTreeSet::default();
(verifiers_from_tx, tx)
}
_ => panic!("Unexpected bench test"),
};

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let vp_address = Address::Internal(InternalAddress::Parameters);
let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
Expand Down Expand Up @@ -1024,12 +1027,12 @@ fn pos(c: &mut Criterion) {
for bench_name in ["foreign_key_write", "parameter_change"] {
let mut shell = BenchShell::default();

let signed_tx = match bench_name {
let (verifiers_from_tx, signed_tx) = match bench_name {
"foreign_key_write" => {
let tx = generate_foreign_key_tx(&defaults::albert_keypair());
// Run the tx to validate
shell.execute_tx(&tx);
tx
let verifiers_from_tx = shell.execute_tx(&tx);
(verifiers_from_tx, tx)
}
"parameter_change" => {
// Simulate governance proposal to modify a parameter
Expand All @@ -1046,15 +1049,16 @@ fn pos(c: &mut Criterion) {
namada::tx::data::DecryptedTx::Decrypted,
));
tx.set_data(namada::tx::Data::new(borsh::to_vec(&0).unwrap()));
tx
let verifiers_from_tx = BTreeSet::default();
(verifiers_from_tx, tx)
}
_ => panic!("Unexpected bench test"),
};

let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let vp_address = Address::Internal(InternalAddress::PoS);
let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
Expand Down Expand Up @@ -1152,12 +1156,12 @@ fn ibc_vp_validate_action(c: &mut Criterion) {
_ => panic!("Unexpected bench test"),
}

shell.execute_tx(signed_tx);
let verifiers_from_tx = shell.execute_tx(signed_tx);
let tx_data = signed_tx.data().unwrap();
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -1252,12 +1256,12 @@ fn ibc_vp_execute_action(c: &mut Criterion) {
_ => panic!("Unexpected bench test"),
}

shell.execute_tx(signed_tx);
let verifiers_from_tx = shell.execute_tx(signed_tx);
let tx_data = signed_tx.data().unwrap();
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down
13 changes: 6 additions & 7 deletions crates/benches/vps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use std::cell::RefCell;
use std::collections::BTreeSet;

use criterion::{criterion_group, criterion_main, Criterion};
use namada::account::UpdateAccount;
Expand Down Expand Up @@ -136,11 +135,11 @@ fn vp_user(c: &mut Criterion) {
"vp",
]) {
let mut shell = BenchShell::default();
shell.execute_tx(signed_tx);
let verifiers_from_tx = shell.execute_tx(signed_tx);
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

group.bench_function(bench_name, |b| {
b.iter(|| {
Expand Down Expand Up @@ -284,11 +283,11 @@ fn vp_implicit(c: &mut Criterion) {
}

// Run the tx to validate
shell.execute_tx(tx);
let verifiers_from_tx = shell.execute_tx(tx);
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

group.bench_function(bench_name, |b| {
b.iter(|| {
Expand Down Expand Up @@ -436,11 +435,11 @@ fn vp_validator(c: &mut Criterion) {
]) {
let mut shell = BenchShell::default();

shell.execute_tx(signed_tx);
let verifiers_from_tx = shell.execute_tx(signed_tx);
let (verifiers, keys_changed) = shell
.state
.write_log()
.verifiers_and_changed_keys(&BTreeSet::default());
.verifiers_and_changed_keys(&verifiers_from_tx);

group.bench_function(bench_name, |b| {
b.iter(|| {
Expand Down
8 changes: 8 additions & 0 deletions crates/core/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,14 @@ impl Key {
self.iter_addresses().cloned().collect()
}

/// Returns the address from the first key segment if it's an address.
pub fn fst_address(&self) -> Option<&Address> {
self.segments.first().and_then(|s| match s {
DbKeySeg::AddressSeg(addr) => Some(addr),
DbKeySeg::StringSeg(_) => None,
})
}

/// Iterates over all addresses in the key segments
pub fn iter_addresses<'k, 'this: 'k>(
&'this self,
Expand Down
Loading
Loading