From a56226878ef8db909149cd04681d0f07c03cadb8 Mon Sep 17 00:00:00 2001 From: Ashok Menon Date: Wed, 27 Mar 2024 09:59:05 +0000 Subject: [PATCH] [BUGFIX][CLI] verify-bytecode-meter returns module ticks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were returning the ticks used for the last function as the verifier ticks, which is not correct. Returning the ticks used for the last function is also not particularly useful, but I will fix that in a follow-up PR. Test Plan: ``` sui-framework/deepbook$ cargo run --bin sui -- \ client verify-bytecode-meter Total number of linter warnings suppressed: 3 (filtered categories: 2) Running bytecode verifier for 7 modules ╭──────────────────────────────────╮ │ Module will pass metering check! │ ├────────┬────────────┬────────────┤ │ │ Module │ Function │ │ Max │ 16000000 │ 16000000 │ │ Used │ 5869980 │ 7040 │ ╰────────┴────────────┴────────────╯ ``` --- sui-execution/src/latest.rs | 2 +- sui-execution/src/v0.rs | 2 +- sui-execution/src/v1.rs | 2 +- sui-execution/src/v2.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sui-execution/src/latest.rs b/sui-execution/src/latest.rs index 1fae861aee18b..72e978810f47e 100644 --- a/sui-execution/src/latest.rs +++ b/sui-execution/src/latest.rs @@ -224,7 +224,7 @@ impl<'m> verifier::Verifier for Verifier<'m> { config.max_per_mod_meter_units = config_overrides.max_per_mod_meter_units; run_metered_move_bytecode_verifier(modules, &config, &mut self.meter, self.metrics)?; let fun_meter_units_result = self.meter.get_usage(Scope::Function); - let mod_meter_units_result = self.meter.get_usage(Scope::Function); + let mod_meter_units_result = self.meter.get_usage(Scope::Module); Ok(VerifierMeteredValues::new( max_per_fun_meter_current, max_per_mod_meter_current, diff --git a/sui-execution/src/v0.rs b/sui-execution/src/v0.rs index d2ec4b11b6d00..c5e6853c6d8dc 100644 --- a/sui-execution/src/v0.rs +++ b/sui-execution/src/v0.rs @@ -238,7 +238,7 @@ impl<'m> verifier::Verifier for Verifier<'m> { self.metrics, )?; let fun_meter_units_result = self.meter.get_usage(Scope::Function); - let mod_meter_units_result = self.meter.get_usage(Scope::Function); + let mod_meter_units_result = self.meter.get_usage(Scope::Module); Ok(VerifierMeteredValues::new( max_per_fun_meter_current, max_per_mod_meter_current, diff --git a/sui-execution/src/v1.rs b/sui-execution/src/v1.rs index 2d7cbc37c5417..870b7460eb429 100644 --- a/sui-execution/src/v1.rs +++ b/sui-execution/src/v1.rs @@ -226,7 +226,7 @@ impl<'m> verifier::Verifier for Verifier<'m> { config.max_per_mod_meter_units = config_overrides.max_per_mod_meter_units; run_metered_move_bytecode_verifier(modules, &config, &mut self.meter, self.metrics)?; let fun_meter_units_result = self.meter.get_usage(Scope::Function); - let mod_meter_units_result = self.meter.get_usage(Scope::Function); + let mod_meter_units_result = self.meter.get_usage(Scope::Module); Ok(VerifierMeteredValues::new( max_per_fun_meter_current, max_per_mod_meter_current, diff --git a/sui-execution/src/v2.rs b/sui-execution/src/v2.rs index ac258a3fc080a..d5f72b11d7484 100644 --- a/sui-execution/src/v2.rs +++ b/sui-execution/src/v2.rs @@ -224,7 +224,7 @@ impl<'m> verifier::Verifier for Verifier<'m> { config.max_per_mod_meter_units = config_overrides.max_per_mod_meter_units; run_metered_move_bytecode_verifier(modules, &config, &mut self.meter, self.metrics)?; let fun_meter_units_result = self.meter.get_usage(Scope::Function); - let mod_meter_units_result = self.meter.get_usage(Scope::Function); + let mod_meter_units_result = self.meter.get_usage(Scope::Module); Ok(VerifierMeteredValues::new( max_per_fun_meter_current, max_per_mod_meter_current,