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

initia-labs · Sep 6, 2024 · 33cf86b · 33cf86b
1 parent 059c7b1
commit 33cf86b
Show file tree

Hide file tree

Showing 133 changed files with 9 additions and 35 deletions.
diff --git a/crates/compiler/src/built_package.rs b/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) =

diff --git a/crates/compiler/src/test_package.rs b/crates/compiler/src/test_package.rs
@@ -37,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();

diff --git a/crates/types/src/compiler.rs b/crates/types/src/compiler.rs
@@ -89,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()

diff --git a/precompile/binaries/minlib/account.mv b/precompile/binaries/minlib/account.mv
diff --git a/precompile/binaries/minlib/acl.mv b/precompile/binaries/minlib/acl.mv
diff --git a/precompile/binaries/minlib/address.mv b/precompile/binaries/minlib/address.mv
diff --git a/precompile/binaries/minlib/any.mv b/precompile/binaries/minlib/any.mv
diff --git a/precompile/binaries/minlib/aptos_hash.mv b/precompile/binaries/minlib/aptos_hash.mv
diff --git a/precompile/binaries/minlib/ascii.mv b/precompile/binaries/minlib/ascii.mv
diff --git a/precompile/binaries/minlib/base64.mv b/precompile/binaries/minlib/base64.mv
diff --git a/precompile/binaries/minlib/bcs.mv b/precompile/binaries/minlib/bcs.mv
diff --git a/precompile/binaries/minlib/bigdecimal.mv b/precompile/binaries/minlib/bigdecimal.mv
diff --git a/precompile/binaries/minlib/biguint.mv b/precompile/binaries/minlib/biguint.mv
diff --git a/precompile/binaries/minlib/bit_vector.mv b/precompile/binaries/minlib/bit_vector.mv
diff --git a/precompile/binaries/minlib/block.mv b/precompile/binaries/minlib/block.mv
diff --git a/precompile/binaries/minlib/capability.mv b/precompile/binaries/minlib/capability.mv
diff --git a/precompile/binaries/minlib/code.mv b/precompile/binaries/minlib/code.mv
diff --git a/precompile/binaries/minlib/coin.mv b/precompile/binaries/minlib/coin.mv
diff --git a/precompile/binaries/minlib/collection.mv b/precompile/binaries/minlib/collection.mv
diff --git a/precompile/binaries/minlib/comparator.mv b/precompile/binaries/minlib/comparator.mv
diff --git a/precompile/binaries/minlib/compare.mv b/precompile/binaries/minlib/compare.mv
diff --git a/precompile/binaries/minlib/copyable_any.mv b/precompile/binaries/minlib/copyable_any.mv
diff --git a/precompile/binaries/minlib/cosmos.mv b/precompile/binaries/minlib/cosmos.mv
diff --git a/precompile/binaries/minlib/debug.mv b/precompile/binaries/minlib/debug.mv
diff --git a/precompile/binaries/minlib/dex.mv b/precompile/binaries/minlib/dex.mv
diff --git a/precompile/binaries/minlib/dispatchable_fungible_asset.mv b/precompile/binaries/minlib/dispatchable_fungible_asset.mv
diff --git a/precompile/binaries/minlib/ed25519.mv b/precompile/binaries/minlib/ed25519.mv
diff --git a/precompile/binaries/minlib/error.mv b/precompile/binaries/minlib/error.mv
diff --git a/precompile/binaries/minlib/event.mv b/precompile/binaries/minlib/event.mv
diff --git a/precompile/binaries/minlib/fixed_point32.mv b/precompile/binaries/minlib/fixed_point32.mv
diff --git a/precompile/binaries/minlib/fixed_point64.mv b/precompile/binaries/minlib/fixed_point64.mv
diff --git a/precompile/binaries/minlib/from_bcs.mv b/precompile/binaries/minlib/from_bcs.mv
diff --git a/precompile/binaries/minlib/function_info.mv b/precompile/binaries/minlib/function_info.mv
diff --git a/precompile/binaries/minlib/fungible_asset.mv b/precompile/binaries/minlib/fungible_asset.mv
diff --git a/precompile/binaries/minlib/guid.mv b/precompile/binaries/minlib/guid.mv
diff --git a/precompile/binaries/minlib/hash.mv b/precompile/binaries/minlib/hash.mv
diff --git a/precompile/binaries/minlib/hex.mv b/precompile/binaries/minlib/hex.mv
diff --git a/precompile/binaries/minlib/initia_nft.mv b/precompile/binaries/minlib/initia_nft.mv
diff --git a/precompile/binaries/minlib/json.mv b/precompile/binaries/minlib/json.mv
diff --git a/precompile/binaries/minlib/keccak.mv b/precompile/binaries/minlib/keccak.mv
diff --git a/precompile/binaries/minlib/managed_coin.mv b/precompile/binaries/minlib/managed_coin.mv
diff --git a/precompile/binaries/minlib/math128.mv b/precompile/binaries/minlib/math128.mv
diff --git a/precompile/binaries/minlib/math64.mv b/precompile/binaries/minlib/math64.mv
diff --git a/precompile/binaries/minlib/multisig.mv b/precompile/binaries/minlib/multisig.mv
diff --git a/precompile/binaries/minlib/nft.mv b/precompile/binaries/minlib/nft.mv
diff --git a/precompile/binaries/minlib/object.mv b/precompile/binaries/minlib/object.mv
diff --git a/precompile/binaries/minlib/object_code_deployment.mv b/precompile/binaries/minlib/object_code_deployment.mv
diff --git a/precompile/binaries/minlib/option.mv b/precompile/binaries/minlib/option.mv
diff --git a/precompile/binaries/minlib/oracle.mv b/precompile/binaries/minlib/oracle.mv
diff --git a/precompile/binaries/minlib/primary_fungible_store.mv b/precompile/binaries/minlib/primary_fungible_store.mv
diff --git a/precompile/binaries/minlib/property_map.mv b/precompile/binaries/minlib/property_map.mv
diff --git a/precompile/binaries/minlib/query.mv b/precompile/binaries/minlib/query.mv
diff --git a/precompile/binaries/minlib/royalty.mv b/precompile/binaries/minlib/royalty.mv
diff --git a/precompile/binaries/minlib/secp256k1.mv b/precompile/binaries/minlib/secp256k1.mv
diff --git a/precompile/binaries/minlib/signer.mv b/precompile/binaries/minlib/signer.mv
diff --git a/precompile/binaries/minlib/simple_map.mv b/precompile/binaries/minlib/simple_map.mv
diff --git a/precompile/binaries/minlib/simple_nft.mv b/precompile/binaries/minlib/simple_nft.mv
diff --git a/precompile/binaries/minlib/soul_bound_token.mv b/precompile/binaries/minlib/soul_bound_token.mv
diff --git a/precompile/binaries/minlib/string.mv b/precompile/binaries/minlib/string.mv
diff --git a/precompile/binaries/minlib/string_utils.mv b/precompile/binaries/minlib/string_utils.mv
diff --git a/precompile/binaries/minlib/table.mv b/precompile/binaries/minlib/table.mv
diff --git a/precompile/binaries/minlib/table_key.mv b/precompile/binaries/minlib/table_key.mv
diff --git a/precompile/binaries/minlib/timestamp.mv b/precompile/binaries/minlib/timestamp.mv
diff --git a/precompile/binaries/minlib/transaction_context.mv b/precompile/binaries/minlib/transaction_context.mv
diff --git a/precompile/binaries/minlib/type_info.mv b/precompile/binaries/minlib/type_info.mv
diff --git a/precompile/binaries/minlib/vector.mv b/precompile/binaries/minlib/vector.mv
diff --git a/precompile/binaries/minlib/vip_score.mv b/precompile/binaries/minlib/vip_score.mv
diff --git a/precompile/binaries/stdlib/account.mv b/precompile/binaries/stdlib/account.mv
diff --git a/precompile/binaries/stdlib/acl.mv b/precompile/binaries/stdlib/acl.mv
diff --git a/precompile/binaries/stdlib/address.mv b/precompile/binaries/stdlib/address.mv
diff --git a/precompile/binaries/stdlib/any.mv b/precompile/binaries/stdlib/any.mv
diff --git a/precompile/binaries/stdlib/aptos_hash.mv b/precompile/binaries/stdlib/aptos_hash.mv
diff --git a/precompile/binaries/stdlib/ascii.mv b/precompile/binaries/stdlib/ascii.mv
diff --git a/precompile/binaries/stdlib/base64.mv b/precompile/binaries/stdlib/base64.mv
diff --git a/precompile/binaries/stdlib/bcs.mv b/precompile/binaries/stdlib/bcs.mv
diff --git a/precompile/binaries/stdlib/bigdecimal.mv b/precompile/binaries/stdlib/bigdecimal.mv
diff --git a/precompile/binaries/stdlib/biguint.mv b/precompile/binaries/stdlib/biguint.mv
diff --git a/precompile/binaries/stdlib/bit_vector.mv b/precompile/binaries/stdlib/bit_vector.mv
diff --git a/precompile/binaries/stdlib/block.mv b/precompile/binaries/stdlib/block.mv
diff --git a/precompile/binaries/stdlib/capability.mv b/precompile/binaries/stdlib/capability.mv
diff --git a/precompile/binaries/stdlib/code.mv b/precompile/binaries/stdlib/code.mv
diff --git a/precompile/binaries/stdlib/coin.mv b/precompile/binaries/stdlib/coin.mv
diff --git a/precompile/binaries/stdlib/collection.mv b/precompile/binaries/stdlib/collection.mv
diff --git a/precompile/binaries/stdlib/comparator.mv b/precompile/binaries/stdlib/comparator.mv
diff --git a/precompile/binaries/stdlib/compare.mv b/precompile/binaries/stdlib/compare.mv
diff --git a/precompile/binaries/stdlib/copyable_any.mv b/precompile/binaries/stdlib/copyable_any.mv
diff --git a/precompile/binaries/stdlib/cosmos.mv b/precompile/binaries/stdlib/cosmos.mv
diff --git a/precompile/binaries/stdlib/debug.mv b/precompile/binaries/stdlib/debug.mv
diff --git a/precompile/binaries/stdlib/dex.mv b/precompile/binaries/stdlib/dex.mv
diff --git a/precompile/binaries/stdlib/dispatchable_fungible_asset.mv b/precompile/binaries/stdlib/dispatchable_fungible_asset.mv
diff --git a/precompile/binaries/stdlib/ed25519.mv b/precompile/binaries/stdlib/ed25519.mv
diff --git a/precompile/binaries/stdlib/error.mv b/precompile/binaries/stdlib/error.mv
diff --git a/precompile/binaries/stdlib/event.mv b/precompile/binaries/stdlib/event.mv
diff --git a/precompile/binaries/stdlib/fixed_point32.mv b/precompile/binaries/stdlib/fixed_point32.mv
diff --git a/precompile/binaries/stdlib/fixed_point64.mv b/precompile/binaries/stdlib/fixed_point64.mv
diff --git a/precompile/binaries/stdlib/from_bcs.mv b/precompile/binaries/stdlib/from_bcs.mv
diff --git a/precompile/binaries/stdlib/function_info.mv b/precompile/binaries/stdlib/function_info.mv
diff --git a/precompile/binaries/stdlib/fungible_asset.mv b/precompile/binaries/stdlib/fungible_asset.mv
diff --git a/precompile/binaries/stdlib/guid.mv b/precompile/binaries/stdlib/guid.mv
diff --git a/precompile/binaries/stdlib/hash.mv b/precompile/binaries/stdlib/hash.mv
diff --git a/precompile/binaries/stdlib/hex.mv b/precompile/binaries/stdlib/hex.mv
diff --git a/precompile/binaries/stdlib/initia_nft.mv b/precompile/binaries/stdlib/initia_nft.mv
diff --git a/precompile/binaries/stdlib/json.mv b/precompile/binaries/stdlib/json.mv
diff --git a/precompile/binaries/stdlib/keccak.mv b/precompile/binaries/stdlib/keccak.mv
diff --git a/precompile/binaries/stdlib/managed_coin.mv b/precompile/binaries/stdlib/managed_coin.mv
diff --git a/precompile/binaries/stdlib/math128.mv b/precompile/binaries/stdlib/math128.mv
diff --git a/precompile/binaries/stdlib/math64.mv b/precompile/binaries/stdlib/math64.mv
diff --git a/precompile/binaries/stdlib/minitswap.mv b/precompile/binaries/stdlib/minitswap.mv
diff --git a/precompile/binaries/stdlib/multisig.mv b/precompile/binaries/stdlib/multisig.mv
diff --git a/precompile/binaries/stdlib/nft.mv b/precompile/binaries/stdlib/nft.mv
diff --git a/precompile/binaries/stdlib/object.mv b/precompile/binaries/stdlib/object.mv
diff --git a/precompile/binaries/stdlib/object_code_deployment.mv b/precompile/binaries/stdlib/object_code_deployment.mv
diff --git a/precompile/binaries/stdlib/option.mv b/precompile/binaries/stdlib/option.mv
diff --git a/precompile/binaries/stdlib/oracle.mv b/precompile/binaries/stdlib/oracle.mv
diff --git a/precompile/binaries/stdlib/primary_fungible_store.mv b/precompile/binaries/stdlib/primary_fungible_store.mv
diff --git a/precompile/binaries/stdlib/property_map.mv b/precompile/binaries/stdlib/property_map.mv
diff --git a/precompile/binaries/stdlib/query.mv b/precompile/binaries/stdlib/query.mv
diff --git a/precompile/binaries/stdlib/royalty.mv b/precompile/binaries/stdlib/royalty.mv
diff --git a/precompile/binaries/stdlib/secp256k1.mv b/precompile/binaries/stdlib/secp256k1.mv
diff --git a/precompile/binaries/stdlib/signer.mv b/precompile/binaries/stdlib/signer.mv
diff --git a/precompile/binaries/stdlib/simple_map.mv b/precompile/binaries/stdlib/simple_map.mv
diff --git a/precompile/binaries/stdlib/simple_nft.mv b/precompile/binaries/stdlib/simple_nft.mv
diff --git a/precompile/binaries/stdlib/soul_bound_token.mv b/precompile/binaries/stdlib/soul_bound_token.mv
diff --git a/precompile/binaries/stdlib/stableswap.mv b/precompile/binaries/stdlib/stableswap.mv
diff --git a/precompile/binaries/stdlib/staking.mv b/precompile/binaries/stdlib/staking.mv
diff --git a/precompile/binaries/stdlib/string.mv b/precompile/binaries/stdlib/string.mv
diff --git a/precompile/binaries/stdlib/string_utils.mv b/precompile/binaries/stdlib/string_utils.mv
diff --git a/precompile/binaries/stdlib/table.mv b/precompile/binaries/stdlib/table.mv
diff --git a/precompile/binaries/stdlib/table_key.mv b/precompile/binaries/stdlib/table_key.mv
diff --git a/precompile/binaries/stdlib/timestamp.mv b/precompile/binaries/stdlib/timestamp.mv
diff --git a/precompile/binaries/stdlib/transaction_context.mv b/precompile/binaries/stdlib/transaction_context.mv
diff --git a/precompile/binaries/stdlib/type_info.mv b/precompile/binaries/stdlib/type_info.mv
diff --git a/precompile/binaries/stdlib/vector.mv b/precompile/binaries/stdlib/vector.mv