feat: update gas meter (#117)

* update gas meter

* revert shared libraries

* fix lint

* bump move to latest

* change compiler version to v1 and use v2.1 when v2 requested

* fix script binary path

Cargo.toml

@@ -112,27 +112,28 @@ tiny-keccak = { version = "2.0.2", features = ["keccak", "sha3"] }
 # Note: the BEGIN and END comments below are required for external tooling. Do not remove.
 # BEGIN MOVE DEPENDENCIES
 
-move-binary-format = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-bytecode-verifier = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-bytecode-utils = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-cli = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-command-line-common = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-compiler = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-core-types = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-docgen = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-model = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-package = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-prover = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-prover-boogie-backend = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-prover-bytecode-pipeline = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-resource-viewer = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-stackless-bytecode = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-stdlib = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-symbol-pool = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-unit-test = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-vm-runtime = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-vm-test-utils = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
-move-vm-types = { git = "https://github.com/initia-labs/aptos-core.git", rev = "1cae58ce6121080564a238238dde2c8124bcb112" }
+move-binary-format = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-bytecode-verifier = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-cli = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-command-line-common = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-compiler = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-coverage = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-core-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-docgen = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-model = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-package = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-prover = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-prover-boogie-backend = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-prover-bytecode-pipeline = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-stackless-bytecode = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-stdlib = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-symbol-pool = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-unit-test = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-vm-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
 
 # END MOVE DEPENDENCIES
 
@@ -143,6 +144,7 @@ move-vm-types = { git = "https://github.com/initia-labs/aptos-core.git", rev = "
 # move-cli = { path = "../aptos-core/third_party/move/tools/move-cli" }
 # move-command-line-common = { path = "../aptos-core/third_party/move/move-command-line-common" }
 # move-compiler = { path = "../aptos-core/third_party/move/move-compiler" }
+# move-coverage ={ path = "../aptos-core/third_party/move/tools/move-coverage" }
 # move-core-types = { path = "../aptos-core/third_party/move/move-core/types" }
 # move-docgen = { path = "../aptos-core/third_party/move/move-prover/move-docgen" }
 # move-model = { path = "../aptos-core/third_party/move/move-model" }

crates/compiler/Cargo.toml

@@ -34,6 +34,7 @@ initia-move-storage = { workspace = true }
 move-command-line-common = { workspace = true }
 move-cli = { workspace = true }
 move-core-types = { workspace = true }
+move-coverage ={ workspace = true }
 move-package = { workspace = true }
 move-unit-test = { workspace = true }
 move-vm-runtime = { workspace = true, features = ["testing"] }

crates/compiler/src/built_package.rs

@@ -11,17 +11,12 @@ use itertools::Itertools;
 use move_binary_format::CompiledModule;
 use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
 use move_compiler::compiled_unit::{CompiledUnit, NamedCompiledModule};
-use move_core_types::{
-    language_storage::ModuleId, metadata::Metadata,
-};
+use move_core_types::{language_storage::ModuleId, metadata::Metadata};
 use move_docgen::DocgenOptions;
-use move_model::{
-    metadata::{CompilerVersion, LanguageVersion},
-    model::GlobalEnv,
-};
+use move_model::metadata::{CompilerVersion, LanguageVersion};
 use move_package::{
     compilation::{compiled_package::CompiledPackage, package_layout::CompiledPackageLayout},
-    BuildConfig, ModelConfig,
+    BuildConfig,
 };
 use std::{
     collections::BTreeMap,
@@ -37,27 +32,6 @@ pub struct BuiltPackage {
     package: CompiledPackage,
 }
 
-pub fn build_model(package_path: &Path, build_config: BuildConfig) -> anyhow::Result<GlobalEnv> {
-    let compiler_version = build_config
-        .compiler_config
-        .compiler_version
-        .unwrap_or(CompilerVersion::V2_0);
-    let language_version = build_config
-        .compiler_config
-        .language_version
-        .unwrap_or(LanguageVersion::V2_0);
-
-    build_config.move_model_for_package(
-        package_path,
-        ModelConfig {
-            target_filter: None,
-            all_files_as_targets: false,
-            compiler_version,
-            language_version,
-        },
-    )
-}
-
 impl BuiltPackage {
     /// Builds the package and on success delivers a `BuiltPackage`.
     ///
@@ -84,10 +58,10 @@ impl BuiltPackage {
 
         // use v2 as default
         if new_config.compiler_config.compiler_version.is_none() {
-            new_config.compiler_config.compiler_version = Some(CompilerVersion::V2_0);
+            new_config.compiler_config.compiler_version = Some(CompilerVersion::V1);
         }
         if new_config.compiler_config.language_version.is_none() {
-            new_config.compiler_config.language_version = Some(LanguageVersion::V2_0);
+            new_config.compiler_config.language_version = Some(LanguageVersion::V1);
         }
 
         let (mut package, model_opt) =

crates/compiler/src/test_package.rs

@@ -11,6 +11,7 @@ use move_cli::base::{
     test::{run_move_unit_tests_with_factory, Test, UnitTestResult},
 };
 use move_core_types::effects::ChangeSet;
+use move_coverage::source_coverage::{ColorChoice, TextIndicator};
 use move_model::metadata::{CompilerVersion, LanguageVersion};
 use move_package::BuildConfig;
 use move_unit_test::UnitTestingConfig;
@@ -36,10 +37,10 @@ impl TestPackage {
 
         // use v2 as default
         if new_build_config.compiler_config.compiler_version.is_none() {
-            new_build_config.compiler_config.compiler_version = Some(CompilerVersion::V2_0);
+            new_build_config.compiler_config.compiler_version = Some(CompilerVersion::V2_1);
         }
         if new_build_config.compiler_config.language_version.is_none() {
-            new_build_config.compiler_config.language_version = Some(LanguageVersion::V2_0);
+            new_build_config.compiler_config.language_version = Some(LanguageVersion::V2_1);
         }
 
         configure_for_unit_test();
@@ -76,6 +77,8 @@ impl TestPackage {
                         functions: false,
                         output_csv: false,
                     },
+                    color: ColorChoice::Default,
+                    tag: TextIndicator::Explicit,
                 },
                 Some(self.package_path.clone()),
                 self.build_config.clone(),

crates/compiler/src/unit_test_factory.rs

@@ -4,7 +4,7 @@ use initia_move_types::write_set::WriteSet;
 use move_binary_format::errors::{Location, PartialVMError, VMResult};
 use move_core_types::{effects::ChangeSet, vm_status::StatusCode};
 use move_unit_test::test_reporter::{TestRunInfo, UnitTestFactory};
-use move_vm_runtime::session::Session;
+use move_vm_runtime::native_extensions::NativeContextExtensions;
 
 pub struct InitiaUnitTestFactory {
     pub gas_params: InitiaGasParameters,
@@ -40,17 +40,19 @@ impl InitiaUnitTestFactory {
 }
 
 // gas meter required for testing gas metering
-impl UnitTestFactory<InitiaGasMeter> for InitiaUnitTestFactory {
-    fn new_gas_meter(&self) -> InitiaGasMeter {
+impl UnitTestFactory for InitiaUnitTestFactory {
+    type GasMeter = InitiaGasMeter;
+    fn new_gas_meter(&self) -> Self::GasMeter {
         InitiaGasMeter::new(self.gas_params.clone(), self.balance)
     }
 
-    fn finish_session(
+    fn finalize_test_run_info(
         &self,
-        session: Session,
-        mut gas_meter: InitiaGasMeter,
+        change_set: &ChangeSet,
+        extensions: &mut NativeContextExtensions,
+        mut gas_meter: Self::GasMeter,
         mut test_run_info: TestRunInfo,
-    ) -> (VMResult<ChangeSet>, TestRunInfo) {
+    ) -> TestRunInfo {
         let mut apply_gas_used = |gas_meter: InitiaGasMeter| {
             test_run_info.gas_used = gas_meter
                 .gas_limit()
@@ -59,23 +61,18 @@ impl UnitTestFactory<InitiaGasMeter> for InitiaUnitTestFactory {
                 .into();
         };
 
-        match session.finish_with_extensions() {
-            Ok((cs, mut exts)) => {
-                let table_context: NativeTableContext = exts.remove::<NativeTableContext>();
-                match Self::charge_write_set_gas(&mut gas_meter, &cs, table_context) {
-                    Ok(()) => {
-                        apply_gas_used(gas_meter);
-                        (Ok(cs), test_run_info)
-                    }
-                    Err(err) => {
-                        apply_gas_used(gas_meter);
-                        (Err(err), test_run_info)
-                    },
-                }
+        match Self::charge_write_set_gas(
+            &mut gas_meter,
+            change_set,
+            extensions.remove::<NativeTableContext>(),
+        ) {
+            Ok(()) => {
+                apply_gas_used(gas_meter);
+                test_run_info
             }
-            Err(err) => {
+            Err(_) => {
                 apply_gas_used(gas_meter);
-                (Err(err), test_run_info)
+                test_run_info
             }
         }
     }

crates/types/Cargo.toml

@@ -13,6 +13,7 @@ move-cli = { workspace = true }
 move-docgen = { workspace = true }
 move-package = { workspace = true }
 move-model = { workspace = true }
+move-coverage = { workspace = true }
 
 anyhow = { workspace = true }
 bcs = { workspace = true }

crates/types/src/compiler.rs

@@ -8,6 +8,7 @@ use move_cli::{
     Move,
 };
 use move_core_types::account_address::AccountAddress;
+use move_coverage::source_coverage::{ColorChoice, TextIndicator};
 use move_docgen::DocgenOptions;
 use move_model::metadata::{CompilerVersion, LanguageVersion};
 use move_package::{Architecture, BuildConfig, CompilerConfig};
@@ -88,12 +89,12 @@ impl From<CompilerBuildConfig> for BuildConfig {
                 },
                 compiler_version: match val.compiler_version {
                     1 => Some(CompilerVersion::V1),
-                    2 => Some(CompilerVersion::V2_0),
+                    2 => Some(CompilerVersion::V2_1),
                     _ => None,
                 },
                 language_version: match val.language_version {
                     1 => Some(LanguageVersion::V1),
-                    2 => Some(LanguageVersion::V2_0),
+                    2 => Some(LanguageVersion::V2_1),
                     _ => None,
                 },
                 ..Default::default()
@@ -150,6 +151,8 @@ impl From<CompilerCoverageSummaryOptions> for Coverage {
                 functions: val.functions,
                 output_csv: val.output_csv,
             },
+            color: ColorChoice::Default,
+            tag: TextIndicator::Explicit,
         }
     }
 }
@@ -166,6 +169,8 @@ impl From<CompilerCoverageSourceOptions> for Coverage {
             options: CoverageSummaryOptions::Source {
                 module_name: module_name.unwrap(),
             },
+            color: ColorChoice::Default,
+            tag: TextIndicator::Explicit,
         }
     }
 }
@@ -182,6 +187,8 @@ impl From<CompilerCoverageBytecodeOptions> for Coverage {
             options: CoverageSummaryOptions::Bytecode {
                 module_name: module_name.unwrap(),
             },
+            color: ColorChoice::Default,
+            tag: TextIndicator::Explicit,
         }
     }
 }

lib_test.go

@@ -414,7 +414,7 @@ func Test_DecodeScript(t *testing.T) {
 	vm, _ := initializeVM(t, true)
 	defer vm.Destroy()
 
-	f, err := os.ReadFile("./precompile/binaries/tests/main_0.mv")
+	f, err := os.ReadFile("./precompile/binaries/tests/main.mv")
 	require.NoError(t, err)
 
 	bz, err := api.DecodeScriptBytes(f)
@@ -428,7 +428,7 @@ func Test_ExecuteScript(t *testing.T) {
 
 	publishModuleBundle(t, vm, kvStore)
 
-	f, err := os.ReadFile("./precompile/binaries/tests/main_0.mv")
+	f, err := os.ReadFile("./precompile/binaries/tests/main.mv")
 	require.NoError(t, err)
 
 	testAccount, err := types.NewAccountAddress("0x2")