diff --git a/Cargo.lock b/Cargo.lock index 0dfe6a6cb7466..15a5724c1f2e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7030,6 +7030,19 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +[[package]] +name = "legacy-move-vm-types" +version = "0.1.0" +dependencies = [ + "bcs", + "move-binary-format", + "move-core-types", + "move-vm-profiler", + "proptest", + "serde", + "smallvec", +] + [[package]] name = "lexical-core" version = "0.8.5" @@ -8083,10 +8096,10 @@ name = "move-stdlib-natives-v0" version = "0.1.1" dependencies = [ "hex", + "legacy-move-vm-types", "move-binary-format", "move-core-types", "move-vm-runtime-v0", - "move-vm-types", "sha2 0.9.9", "sha3 0.9.1", "smallvec", @@ -8097,10 +8110,10 @@ name = "move-stdlib-natives-v1" version = "0.1.1" dependencies = [ "hex", + "legacy-move-vm-types", "move-binary-format", "move-core-types", "move-vm-runtime-v1", - "move-vm-types", "sha2 0.9.9", "sha3 0.9.1", "smallvec", @@ -8111,10 +8124,10 @@ name = "move-stdlib-natives-v2" version = "0.1.1" dependencies = [ "hex", + "legacy-move-vm-types", "move-binary-format", "move-core-types", "move-vm-runtime-v2", - "move-vm-types", "sha2 0.9.9", "sha3 0.9.1", "smallvec", @@ -8254,12 +8267,12 @@ version = "0.1.0" dependencies = [ "better_any", "fail", + "legacy-move-vm-types", "move-binary-format", "move-bytecode-verifier-v0", "move-core-types", "move-vm-config", "move-vm-profiler", - "move-vm-types", "once_cell", "parking_lot 0.11.2", "smallvec", @@ -8272,12 +8285,12 @@ version = "0.1.0" dependencies = [ "better_any", "fail", + "legacy-move-vm-types", "move-binary-format", "move-bytecode-verifier-v1", "move-core-types", "move-vm-config", "move-vm-profiler", - "move-vm-types", "once_cell", "parking_lot 0.11.2", "smallvec", @@ -8290,31 +8303,18 @@ version = "0.1.0" dependencies = [ "better_any", "fail", + "legacy-move-vm-types", "move-binary-format", "move-bytecode-verifier-v2", "move-core-types", "move-vm-config", "move-vm-profiler", - "move-vm-types", "once_cell", "parking_lot 0.11.2", "smallvec", "tracing", ] -[[package]] -name = "move-vm-types" -version = "0.1.0" -dependencies = [ - "bcs", - "move-binary-format", - "move-core-types", - "move-vm-profiler", - "proptest", - "serde", - "smallvec", -] - [[package]] name = "msim" version = "0.1.0" @@ -13112,6 +13112,7 @@ dependencies = [ "anyhow", "bcs", "leb128", + "legacy-move-vm-types", "move-binary-format", "move-bytecode-utils", "move-bytecode-verifier-meter", @@ -13121,7 +13122,6 @@ dependencies = [ "move-vm-config", "move-vm-profiler", "move-vm-runtime-v0", - "move-vm-types", "once_cell", "parking_lot 0.12.3", "serde", @@ -13140,6 +13140,7 @@ dependencies = [ "anyhow", "bcs", "leb128", + "legacy-move-vm-types", "move-binary-format", "move-bytecode-utils", "move-bytecode-verifier-meter", @@ -13149,7 +13150,6 @@ dependencies = [ "move-vm-config", "move-vm-profiler", "move-vm-runtime-v1", - "move-vm-types", "parking_lot 0.12.3", "serde", "sui-macros", @@ -13167,6 +13167,7 @@ dependencies = [ "anyhow", "bcs", "leb128", + "legacy-move-vm-types", "move-binary-format", "move-bytecode-utils", "move-bytecode-verifier-meter", @@ -13176,7 +13177,6 @@ dependencies = [ "move-vm-config", "move-vm-profiler", "move-vm-runtime-v2", - "move-vm-types", "parking_lot 0.12.3", "serde", "sui-macros", @@ -13890,6 +13890,7 @@ name = "sui-execution" version = "0.1.0" dependencies = [ "cargo_metadata 0.15.4", + "legacy-move-vm-types", "move-abstract-interpreter", "move-abstract-interpreter-v2", "move-binary-format", @@ -14710,12 +14711,12 @@ dependencies = [ "better_any", "fastcrypto", "fastcrypto-zkp", + "legacy-move-vm-types", "linked-hash-map", "move-binary-format", "move-core-types", "move-stdlib-natives-v0", "move-vm-runtime-v0", - "move-vm-types", "smallvec", "sui-protocol-config", "sui-types", @@ -14730,12 +14731,12 @@ dependencies = [ "better_any", "fastcrypto", "fastcrypto-zkp", + "legacy-move-vm-types", "linked-hash-map", "move-binary-format", "move-core-types", "move-stdlib-natives-v1", "move-vm-runtime-v1", - "move-vm-types", "smallvec", "sui-protocol-config", "sui-types", @@ -14751,11 +14752,11 @@ dependencies = [ "fastcrypto", "fastcrypto-zkp", "indexmap 2.7.0", + "legacy-move-vm-types", "move-binary-format", "move-core-types", "move-stdlib-natives-v2", "move-vm-runtime-v2", - "move-vm-types", "smallvec", "sui-protocol-config", "sui-types", @@ -15984,6 +15985,7 @@ dependencies = [ "indexmap 2.7.0", "itertools 0.13.0", "jsonrpsee", + "legacy-move-vm-types", "lru 0.10.1", "move-binary-format", "move-bytecode-utils", @@ -15993,7 +15995,6 @@ dependencies = [ "move-ir-types", "move-vm-profiler", "move-vm-runtime", - "move-vm-types", "mysten-metrics", "mysten-network", "nonempty", diff --git a/Cargo.toml b/Cargo.toml index f04faf49a3705..d4d86a04e366f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -567,6 +567,7 @@ move-disassembler = { path = "external-crates/move/crates/move-disassembler" } move-package = { path = "external-crates/move/crates/move-package" } move-unit-test = { path = "external-crates/move/crates/move-unit-test" } move-vm-config = { path = "external-crates/move/crates/move-vm-config" } +legacy-move-vm-types = { path = "external-crates/move/crates/legacy-move-vm-types" } ## TODO(vm-rewrite): we need to have a better execution versioning story here as just relying on the vm-runtime directly is not kosher... move-vm-runtime = { path = "external-crates/move/crates/move-vm-runtime/", features = [ "tiered-gas", diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml index e5d855830b557..ad1c4c4803fd5 100644 --- a/crates/sui-types/Cargo.toml +++ b/crates/sui-types/Cargo.toml @@ -76,8 +76,7 @@ lru.workspace = true sui-sdk-types.workspace = true -## TODO(vm-rewrite): Determine where to place the historical trait implementation of the `GasMeter` trait, and this will determine whether we remove this, or if we want to add it to the workspace officially. -move-vm-types-old = { path = "../../external-crates/move/move-execution/shared/crates/move-vm-types", package = "move-vm-types" } +legacy-move-vm-types.workspace = true [dev-dependencies] bincode.workspace = true diff --git a/crates/sui-types/src/gas_model/tables.rs b/crates/sui-types/src/gas_model/tables.rs index 8689370aa1f37..5ae8fe465ab55 100644 --- a/crates/sui-types/src/gas_model/tables.rs +++ b/crates/sui-types/src/gas_model/tables.rs @@ -944,7 +944,6 @@ pub fn initial_cost_schedule_for_unit_tests() -> TestCostTable { } } -// TODO(vm-rewrite): Move this to a better place. Possibly under `sui-execution`? mod old_versions { use crate::gas_model::gas_predicates::native_function_threshold_exceeded; use crate::gas_model::gas_predicates::use_legacy_abstract_size; @@ -955,6 +954,10 @@ mod old_versions { GasStatus, BOOL_SIZE, REFERENCE_SIZE, U128_SIZE, U16_SIZE, U256_SIZE, U32_SIZE, U64_SIZE, U8_SIZE, }; + use legacy_move_vm_types::gas::GasMeter; + use legacy_move_vm_types::gas::SimpleInstruction; + use legacy_move_vm_types::views::TypeView; + use legacy_move_vm_types::views::ValueView; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::AbstractMemorySize; use move_core_types::gas_algebra::InternalGas; @@ -962,10 +965,6 @@ mod old_versions { use move_core_types::gas_algebra::NumBytes; use move_core_types::language_storage::ModuleId; use move_vm_profiler::GasProfiler; - use move_vm_types_old::gas::GasMeter; - use move_vm_types_old::gas::SimpleInstruction; - use move_vm_types_old::views::TypeView; - use move_vm_types_old::views::ValueView; /// Returns a tuple of (, , , ) fn get_simple_instruction_stack_change( diff --git a/external-crates/move/Cargo.lock b/external-crates/move/Cargo.lock index 56f6e049ea4ff..df5114124ffd8 100644 --- a/external-crates/move/Cargo.lock +++ b/external-crates/move/Cargo.lock @@ -1553,6 +1553,19 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +[[package]] +name = "legacy-move-vm-types" +version = "0.1.0" +dependencies = [ + "bcs", + "move-binary-format", + "move-core-types", + "move-vm-profiler", + "proptest", + "serde", + "smallvec", +] + [[package]] name = "libc" version = "0.2.168" diff --git a/external-crates/move/Cargo.toml b/external-crates/move/Cargo.toml index e8b05e4779913..16ab46deb1b8e 100644 --- a/external-crates/move/Cargo.toml +++ b/external-crates/move/Cargo.toml @@ -176,6 +176,7 @@ move-vm-config = { path = "crates/move-vm-config" } move-vm-profiler = { path = "crates/move-vm-profiler" } move-vm-runtime = { path = "crates/move-vm-runtime" } prover_bytecode = { path = "crates/move-stackless-bytecode", package="move-stackless-bytecode" } +legacy-move-vm-types = { path = "crates/legacy-move-vm-types" } [profile.bench] debug = true diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/Cargo.toml b/external-crates/move/crates/legacy-move-vm-types/Cargo.toml similarity index 87% rename from external-crates/move/move-execution/shared/crates/move-vm-types/Cargo.toml rename to external-crates/move/crates/legacy-move-vm-types/Cargo.toml index 998ed8311c278..2fcb82ef9caa4 100644 --- a/external-crates/move/move-execution/shared/crates/move-vm-types/Cargo.toml +++ b/external-crates/move/crates/legacy-move-vm-types/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "move-vm-types" +name = "legacy-move-vm-types" version = "0.1.0" authors = ["Diem Association "] -description = "Types for Move VM" +description = "Legacy (pre-rewrite) Types for Move VM" repository = "https://github.com/diem/diem" homepage = "https://diem.com" license = "Apache-2.0" diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/data_store.rs b/external-crates/move/crates/legacy-move-vm-types/src/data_store.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/data_store.rs rename to external-crates/move/crates/legacy-move-vm-types/src/data_store.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/gas.rs b/external-crates/move/crates/legacy-move-vm-types/src/gas.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/gas.rs rename to external-crates/move/crates/legacy-move-vm-types/src/gas.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/lib.rs b/external-crates/move/crates/legacy-move-vm-types/src/lib.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/lib.rs rename to external-crates/move/crates/legacy-move-vm-types/src/lib.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/loaded_data/mod.rs b/external-crates/move/crates/legacy-move-vm-types/src/loaded_data/mod.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/loaded_data/mod.rs rename to external-crates/move/crates/legacy-move-vm-types/src/loaded_data/mod.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/loaded_data/runtime_types.rs b/external-crates/move/crates/legacy-move-vm-types/src/loaded_data/runtime_types.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/loaded_data/runtime_types.rs rename to external-crates/move/crates/legacy-move-vm-types/src/loaded_data/runtime_types.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/natives/function.rs b/external-crates/move/crates/legacy-move-vm-types/src/natives/function.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/natives/function.rs rename to external-crates/move/crates/legacy-move-vm-types/src/natives/function.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/natives/mod.rs b/external-crates/move/crates/legacy-move-vm-types/src/natives/mod.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/natives/mod.rs rename to external-crates/move/crates/legacy-move-vm-types/src/natives/mod.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/unit_tests/identifier_prop_tests.rs b/external-crates/move/crates/legacy-move-vm-types/src/unit_tests/identifier_prop_tests.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/unit_tests/identifier_prop_tests.rs rename to external-crates/move/crates/legacy-move-vm-types/src/unit_tests/identifier_prop_tests.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/unit_tests/mod.rs b/external-crates/move/crates/legacy-move-vm-types/src/unit_tests/mod.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/unit_tests/mod.rs rename to external-crates/move/crates/legacy-move-vm-types/src/unit_tests/mod.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/values/mod.rs b/external-crates/move/crates/legacy-move-vm-types/src/values/mod.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/values/mod.rs rename to external-crates/move/crates/legacy-move-vm-types/src/values/mod.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/values/value_prop_tests.rs b/external-crates/move/crates/legacy-move-vm-types/src/values/value_prop_tests.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/values/value_prop_tests.rs rename to external-crates/move/crates/legacy-move-vm-types/src/values/value_prop_tests.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/values/value_tests.rs b/external-crates/move/crates/legacy-move-vm-types/src/values/value_tests.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/values/value_tests.rs rename to external-crates/move/crates/legacy-move-vm-types/src/values/value_tests.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/values/values_impl.rs b/external-crates/move/crates/legacy-move-vm-types/src/values/values_impl.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/values/values_impl.rs rename to external-crates/move/crates/legacy-move-vm-types/src/values/values_impl.rs diff --git a/external-crates/move/move-execution/shared/crates/move-vm-types/src/views.rs b/external-crates/move/crates/legacy-move-vm-types/src/views.rs similarity index 100% rename from external-crates/move/move-execution/shared/crates/move-vm-types/src/views.rs rename to external-crates/move/crates/legacy-move-vm-types/src/views.rs diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml index f3d8225ebbd04..c84f0de7d49ae 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml @@ -13,7 +13,7 @@ publish = false [dependencies] move-binary-format.workspace = true move-core-types.workspace = true -move-vm-types = { path = "../../../shared/crates/move-vm-types" } +legacy-move-vm-types.workspace = true move-vm-runtime = { path = "../move-vm-runtime", package = "move-vm-runtime-v0" } smallvec.workspace = true sha2.workspace = true diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/bcs.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/bcs.rs index 96a851868aef5..91233629ddb2e 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/bcs.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/bcs.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/debug.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/debug.rs index c7bd1ee8c4aaf..3b4f215876c7d 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/debug.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/debug.rs @@ -7,7 +7,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::native_functions::{NativeContext, NativeFunction}; #[allow(unused_imports)] -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, @@ -197,7 +197,7 @@ mod testing { vm_status::StatusCode, }; use move_vm_runtime::native_functions::NativeContext; - use move_vm_types::{loaded_data::runtime_types::Type, values::Value}; + use legacy_move_vm_types::{loaded_data::runtime_types::Type, values::Value}; use std::{fmt, fmt::Write}; const VECTOR_BEGIN: &str = "["; diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/hash.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/hash.rs index 080a16b50779d..a9a0aba4f1f57 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/hash.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/hash.rs @@ -9,7 +9,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use sha2::{Digest, Sha256}; diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/signer.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/signer.rs index 817a6e7bc4348..340c4f92051cb 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/signer.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/signer.rs @@ -9,7 +9,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/string.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/string.rs index 5f60ff49b85fe..6aeb113813f65 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/string.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/string.rs @@ -11,7 +11,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/type_name.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/type_name.rs index bb99b227f9577..7abbd6a9d6c37 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/type_name.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/type_name.rs @@ -7,7 +7,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::{Struct, Value}, diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/unit_test.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/unit_test.rs index 7d2add8174afd..f930fb38a7197 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/unit_test.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/unit_test.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/vector.rs b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/vector.rs index a232870a27375..a3002d0fb05b4 100644 --- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/vector.rs +++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/src/vector.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml b/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml index 13d1fb29f5dd0..7bef8e3ceb0d2 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml @@ -18,9 +18,9 @@ once_cell.workspace = true parking_lot.workspace = true tracing.workspace = true smallvec.workspace = true +legacy-move-vm-types.workspace = true move-bytecode-verifier = { path = "../move-bytecode-verifier", package = "move-bytecode-verifier-v0" } -move-vm-types = { path = "../../../shared/crates/move-vm-types" } move-core-types.workspace = true move-vm-config.workspace = true move-vm-profiler.workspace = true @@ -35,7 +35,7 @@ move-compiler.workspace = true [features] default = [] -fuzzing = ["move-vm-types/fuzzing"] +fuzzing = ["legacy-move-vm-types/fuzzing"] failpoints = ["fail/failpoints"] # Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds. debugging = [] diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/data_cache.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/data_cache.rs index d0dd2247e0472..34ab342fdf209 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/data_cache.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/data_cache.rs @@ -10,7 +10,7 @@ use move_core_types::{ language_storage::ModuleId, vm_status::StatusCode, }; -use move_vm_types::data_store::{DataStore, MoveResolver}; +use legacy_move_vm_types::data_store::{DataStore, MoveResolver}; use std::collections::btree_map::BTreeMap; pub struct AccountDataCache { diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/debug.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/debug.rs index 0a15ea07a88e4..ef833f45cc16d 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/debug.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/debug.rs @@ -7,7 +7,7 @@ use crate::{ loader::{Function, Loader}, }; use move_binary_format::file_format::Bytecode; -use move_vm_types::values::{self, Locals}; +use legacy_move_vm_types::values::{self, Locals}; use std::{ collections::BTreeSet, io::{self, Write}, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/interpreter.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/interpreter.rs index 86bc799896c51..1d708ba9d29cb 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/interpreter.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/interpreter.rs @@ -23,7 +23,7 @@ use move_vm_config::runtime::VMRuntimeLimitsConfig; use move_vm_profiler::{ profile_close_frame, profile_close_instr, profile_open_frame, profile_open_instr, }; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::DataStore, gas::{GasMeter, SimpleInstruction}, loaded_data::runtime_types::Type, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs index bb189d673c964..044e658610ede 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs @@ -30,7 +30,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::DataStore, loaded_data::runtime_types::{ CachedDatatype, CachedTypeIndex, Datatype, DepthFormula, StructType, Type, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/move_vm.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/move_vm.rs index 8b91c15b8f47d..0991741409cbd 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/move_vm.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/move_vm.rs @@ -17,7 +17,7 @@ use move_core_types::{ metadata::Metadata, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::data_store::MoveResolver; +use legacy_move_vm_types::data_store::MoveResolver; pub struct MoveVM { runtime: VMRuntime, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/native_functions.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/native_functions.rs index 631168c8091f8..fd21e3385db8e 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/native_functions.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/native_functions.rs @@ -16,7 +16,7 @@ use move_core_types::{ vm_status::{StatusCode, StatusType}, }; use move_vm_config::runtime::VMRuntimeLimitsConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use std::{ diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/runtime.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/runtime.rs index 168d7edbd2b1f..c4029db2e5749 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/runtime.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/runtime.rs @@ -25,7 +25,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::{DataStore, MoveResolver}, gas::GasMeter, loaded_data::runtime_types::Type, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/session.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/session.rs index 16cc7db224fba..7af51e739ebec 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/session.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/session.rs @@ -18,7 +18,7 @@ use move_core_types::{ language_storage::{ModuleId, TypeTag}, runtime_value as R, }; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::MoveResolver, gas::GasMeter, loaded_data::runtime_types::{CachedDatatype, CachedTypeIndex, Type}, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs index a4c984c62a537..06e1e3ee92c32 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs @@ -8,7 +8,7 @@ use crate::debug::DebugContext; #[cfg(any(debug_assertions, feature = "debugging"))] use ::{ move_binary_format::file_format::Bytecode, - move_vm_types::values::Locals, + legacy_move_vm_types::values::Locals, once_cell::sync::Lazy, std::{ env, diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs index 5ca33f5e72ebf..0a27eb76dc457 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs @@ -24,7 +24,7 @@ use move_core_types::{ u256::U256, vm_status::{StatusCode, StatusType}, }; -use move_vm_types::gas::UnmeteredGasMeter; +use legacy_move_vm_types::gas::UnmeteredGasMeter; fn make_module_with_function( visibility: Visibility, diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/Cargo.toml b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/Cargo.toml index 852e2ff24cde8..fa6a93be529b0 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/Cargo.toml +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/Cargo.toml @@ -13,7 +13,7 @@ publish = false [dependencies] move-binary-format.workspace = true move-core-types.workspace = true -move-vm-types = { path = "../../../shared/crates/move-vm-types" } +legacy-move-vm-types.workspace = true move-vm-runtime = { path = "../move-vm-runtime", package = "move-vm-runtime-v1" } smallvec.workspace = true sha2.workspace = true diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/bcs.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/bcs.rs index 96a851868aef5..91233629ddb2e 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/bcs.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/bcs.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/debug.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/debug.rs index 9547fd57a5521..ca68951d44d31 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/debug.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/debug.rs @@ -7,7 +7,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::native_functions::{NativeContext, NativeFunction}; #[allow(unused_imports)] -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, @@ -195,7 +195,7 @@ mod testing { runtime_value as R, vm_status::StatusCode, }; use move_vm_runtime::native_functions::NativeContext; - use move_vm_types::{loaded_data::runtime_types::Type, values::Value}; + use legacy_move_vm_types::{loaded_data::runtime_types::Type, values::Value}; use std::{fmt, fmt::Write}; const VECTOR_BEGIN: &str = "["; diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/hash.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/hash.rs index 080a16b50779d..a9a0aba4f1f57 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/hash.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/hash.rs @@ -9,7 +9,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use sha2::{Digest, Sha256}; diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/signer.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/signer.rs index 817a6e7bc4348..340c4f92051cb 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/signer.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/signer.rs @@ -9,7 +9,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/string.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/string.rs index 5f60ff49b85fe..6aeb113813f65 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/string.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/string.rs @@ -11,7 +11,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/type_name.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/type_name.rs index bb99b227f9577..7abbd6a9d6c37 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/type_name.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/type_name.rs @@ -7,7 +7,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::{Struct, Value}, diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/unit_test.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/unit_test.rs index 7d2add8174afd..f930fb38a7197 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/unit_test.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/unit_test.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/vector.rs b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/vector.rs index a232870a27375..a3002d0fb05b4 100644 --- a/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/vector.rs +++ b/external-crates/move/move-execution/v1/crates/move-stdlib-natives/src/vector.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml b/external-crates/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml index 25aa1b775afe8..66bcb61511967 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/Cargo.toml @@ -18,9 +18,9 @@ once_cell.workspace = true parking_lot.workspace = true tracing.workspace = true smallvec.workspace = true +legacy-move-vm-types.workspace = true move-bytecode-verifier = { path = "../move-bytecode-verifier", package = "move-bytecode-verifier-v1" } -move-vm-types = { path = "../../../shared/crates/move-vm-types" } move-core-types.workspace = true move-vm-config.workspace = true move-binary-format.workspace = true @@ -35,7 +35,7 @@ move-compiler.workspace = true [features] default = [] -fuzzing = ["move-vm-types/fuzzing"] +fuzzing = ["legacy-move-vm-types/fuzzing"] failpoints = ["fail/failpoints"] # Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds. debugging = [] diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs index d0dd2247e0472..34ab342fdf209 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/data_cache.rs @@ -10,7 +10,7 @@ use move_core_types::{ language_storage::ModuleId, vm_status::StatusCode, }; -use move_vm_types::data_store::{DataStore, MoveResolver}; +use legacy_move_vm_types::data_store::{DataStore, MoveResolver}; use std::collections::btree_map::BTreeMap; pub struct AccountDataCache { diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs index 0a15ea07a88e4..ef833f45cc16d 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/debug.rs @@ -7,7 +7,7 @@ use crate::{ loader::{Function, Loader}, }; use move_binary_format::file_format::Bytecode; -use move_vm_types::values::{self, Locals}; +use legacy_move_vm_types::values::{self, Locals}; use std::{ collections::BTreeSet, io::{self, Write}, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs index 68405ba02b983..efeae6b910597 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/interpreter.rs @@ -22,7 +22,7 @@ use move_vm_config::runtime::VMRuntimeLimitsConfig; use move_vm_profiler::{ profile_close_frame, profile_close_instr, profile_open_frame, profile_open_instr, }; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::DataStore, gas::{GasMeter, SimpleInstruction}, loaded_data::runtime_types::Type, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs index 7744987a8a955..e8e3c029523c4 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/loader.rs @@ -30,7 +30,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::DataStore, loaded_data::runtime_types::{ CachedDatatype, CachedTypeIndex, Datatype, DepthFormula, StructType, Type, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs index acd61a63f2ce4..88e5e3541237c 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/move_vm.rs @@ -17,7 +17,7 @@ use move_core_types::{ metadata::Metadata, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::data_store::MoveResolver; +use legacy_move_vm_types::data_store::MoveResolver; pub struct MoveVM { runtime: VMRuntime, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs index 631168c8091f8..fd21e3385db8e 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/native_functions.rs @@ -16,7 +16,7 @@ use move_core_types::{ vm_status::{StatusCode, StatusType}, }; use move_vm_config::runtime::VMRuntimeLimitsConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use std::{ diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs index f912c59709ef0..0232bb1808a1a 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/runtime.rs @@ -26,7 +26,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::{DataStore, MoveResolver}, gas::GasMeter, loaded_data::runtime_types::{CachedDatatype, CachedTypeIndex, Type}, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/session.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/session.rs index cec31229696ce..a64994d1a2d72 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/session.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/session.rs @@ -18,7 +18,7 @@ use move_core_types::{ language_storage::{ModuleId, TypeTag}, runtime_value::MoveTypeLayout, }; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::MoveResolver, gas::GasMeter, loaded_data::runtime_types::{CachedDatatype, CachedTypeIndex, Type}, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs index a4c984c62a537..06e1e3ee92c32 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs @@ -8,7 +8,7 @@ use crate::debug::DebugContext; #[cfg(any(debug_assertions, feature = "debugging"))] use ::{ move_binary_format::file_format::Bytecode, - move_vm_types::values::Locals, + legacy_move_vm_types::values::Locals, once_cell::sync::Lazy, std::{ env, diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs index 2abe3864f0bd7..a76dab166eaaf 100644 --- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs +++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs @@ -24,7 +24,7 @@ use move_core_types::{ u256::U256, vm_status::{StatusCode, StatusType}, }; -use move_vm_types::gas::UnmeteredGasMeter; +use legacy_move_vm_types::gas::UnmeteredGasMeter; fn make_module_with_function( visibility: Visibility, diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/Cargo.toml b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/Cargo.toml index 9384db744d2ff..4012bdc725113 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/Cargo.toml +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/Cargo.toml @@ -13,7 +13,7 @@ publish = false [dependencies] move-binary-format.workspace = true move-core-types.workspace = true -move-vm-types = { path = "../../../shared/crates/move-vm-types" } +legacy-move-vm-types.workspace = true move-vm-runtime = { path = "../move-vm-runtime", package = "move-vm-runtime-v2" } smallvec.workspace = true sha2.workspace = true diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/bcs.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/bcs.rs index 96a851868aef5..91233629ddb2e 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/bcs.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/bcs.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/debug.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/debug.rs index 9547fd57a5521..ca68951d44d31 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/debug.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/debug.rs @@ -7,7 +7,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::native_functions::{NativeContext, NativeFunction}; #[allow(unused_imports)] -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, @@ -195,7 +195,7 @@ mod testing { runtime_value as R, vm_status::StatusCode, }; use move_vm_runtime::native_functions::NativeContext; - use move_vm_types::{loaded_data::runtime_types::Type, values::Value}; + use legacy_move_vm_types::{loaded_data::runtime_types::Type, values::Value}; use std::{fmt, fmt::Write}; const VECTOR_BEGIN: &str = "["; diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/hash.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/hash.rs index 080a16b50779d..a9a0aba4f1f57 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/hash.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/hash.rs @@ -9,7 +9,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use sha2::{Digest, Sha256}; diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/signer.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/signer.rs index 817a6e7bc4348..340c4f92051cb 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/signer.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/signer.rs @@ -9,7 +9,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/string.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/string.rs index 5f60ff49b85fe..6aeb113813f65 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/string.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/string.rs @@ -11,7 +11,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/type_name.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/type_name.rs index bb99b227f9577..7abbd6a9d6c37 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/type_name.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/type_name.rs @@ -7,7 +7,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::{Struct, Value}, diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/unit_test.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/unit_test.rs index c518599e86451..4c1e11f5e7194 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/unit_test.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/unit_test.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/vector.rs b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/vector.rs index a232870a27375..a3002d0fb05b4 100644 --- a/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/vector.rs +++ b/external-crates/move/move-execution/v2/crates/move-stdlib-natives/src/vector.rs @@ -12,7 +12,7 @@ use move_vm_runtime::{ native_charge_gas_early_exit, native_functions::{NativeContext, NativeFunction}, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/Cargo.toml b/external-crates/move/move-execution/v2/crates/move-vm-runtime/Cargo.toml index a9ed86a5de85e..6f129db7fba0f 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/Cargo.toml +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/Cargo.toml @@ -18,9 +18,9 @@ once_cell.workspace = true parking_lot.workspace = true tracing.workspace = true smallvec.workspace = true +legacy-move-vm-types.workspace = true move-bytecode-verifier = { path = "../move-bytecode-verifier", package = "move-bytecode-verifier-v2" } -move-vm-types = { path = "../../../shared/crates/move-vm-types" } move-core-types.workspace = true move-vm-config.workspace = true move-binary-format.workspace = true @@ -35,7 +35,7 @@ move-compiler.workspace = true [features] default = [] -fuzzing = ["move-vm-types/fuzzing"] +fuzzing = ["legacy-move-vm-types/fuzzing"] failpoints = ["fail/failpoints"] # Enable tracing and debugging also for release builds. By default, it is only enabled for debug builds. debugging = [] diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/data_cache.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/data_cache.rs index d0dd2247e0472..34ab342fdf209 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/data_cache.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/data_cache.rs @@ -10,7 +10,7 @@ use move_core_types::{ language_storage::ModuleId, vm_status::StatusCode, }; -use move_vm_types::data_store::{DataStore, MoveResolver}; +use legacy_move_vm_types::data_store::{DataStore, MoveResolver}; use std::collections::btree_map::BTreeMap; pub struct AccountDataCache { diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/debug.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/debug.rs index 484844d810ff7..5f89a59e00ec0 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/debug.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/debug.rs @@ -7,7 +7,7 @@ use crate::{ loader::{Function, Loader}, }; use move_binary_format::file_format::Bytecode; -use move_vm_types::values::{self, Locals}; +use legacy_move_vm_types::values::{self, Locals}; use std::{ collections::BTreeSet, io::{self, Write}, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/interpreter.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/interpreter.rs index ba1e98caeda69..2f0cd9f8c78eb 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/interpreter.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/interpreter.rs @@ -22,7 +22,7 @@ use move_vm_config::runtime::VMRuntimeLimitsConfig; use move_vm_profiler::{ profile_close_frame, profile_close_instr, profile_open_frame, profile_open_instr, }; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::DataStore, gas::{GasMeter, SimpleInstruction}, loaded_data::runtime_types::Type, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/loader.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/loader.rs index 65117a1c3c426..b4c86a12ce862 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/loader.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/loader.rs @@ -28,7 +28,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::DataStore, loaded_data::runtime_types::{ CachedDatatype, CachedTypeIndex, Datatype, DepthFormula, StructType, Type, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/move_vm.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/move_vm.rs index acd61a63f2ce4..88e5e3541237c 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/move_vm.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/move_vm.rs @@ -17,7 +17,7 @@ use move_core_types::{ metadata::Metadata, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::data_store::MoveResolver; +use legacy_move_vm_types::data_store::MoveResolver; pub struct MoveVM { runtime: VMRuntime, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/native_functions.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/native_functions.rs index 631168c8091f8..fd21e3385db8e 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/native_functions.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/native_functions.rs @@ -16,7 +16,7 @@ use move_core_types::{ vm_status::{StatusCode, StatusType}, }; use move_vm_config::runtime::VMRuntimeLimitsConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use std::{ diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/runtime.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/runtime.rs index 320c3bdbbcc8e..5dc72a810e65e 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/runtime.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/runtime.rs @@ -25,7 +25,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_config::runtime::VMConfig; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::{DataStore, MoveResolver}, gas::GasMeter, loaded_data::runtime_types::{CachedDatatype, CachedTypeIndex, Type}, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/session.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/session.rs index f8938b0a17dfa..71f750698e390 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/session.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/session.rs @@ -18,7 +18,7 @@ use move_core_types::{ language_storage::{ModuleId, TypeTag}, runtime_value::MoveTypeLayout, }; -use move_vm_types::{ +use legacy_move_vm_types::{ data_store::MoveResolver, gas::GasMeter, loaded_data::runtime_types::{CachedDatatype, CachedTypeIndex, Type}, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs index a4c984c62a537..06e1e3ee92c32 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs @@ -8,7 +8,7 @@ use crate::debug::DebugContext; #[cfg(any(debug_assertions, feature = "debugging"))] use ::{ move_binary_format::file_format::Bytecode, - move_vm_types::values::Locals, + legacy_move_vm_types::values::Locals, once_cell::sync::Lazy, std::{ env, diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs index 09f7c7f742891..e5992cb6f0017 100644 --- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs +++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/unit_tests/vm_arguments_tests.rs @@ -24,7 +24,7 @@ use move_core_types::{ u256::U256, vm_status::{StatusCode, StatusType}, }; -use move_vm_types::gas::UnmeteredGasMeter; +use legacy_move_vm_types::gas::UnmeteredGasMeter; fn make_module_with_function( visibility: Visibility, diff --git a/sui-execution/Cargo.toml b/sui-execution/Cargo.toml index 785a0e47929f2..514802ce5de81 100644 --- a/sui-execution/Cargo.toml +++ b/sui-execution/Cargo.toml @@ -14,6 +14,7 @@ sui-types.workspace = true move-binary-format.workspace = true move-bytecode-verifier-meter.workspace = true move-vm-config.workspace = true +legacy-move-vm-types.workspace = true sui-adapter-latest = { path = "latest/sui-adapter" } sui-adapter-v0 = { path = "v0/sui-adapter" } diff --git a/sui-execution/cut/src/plan.rs b/sui-execution/cut/src/plan.rs index cd1ad60340b07..23bafa397b6ed 100644 --- a/sui-execution/cut/src/plan.rs +++ b/sui-execution/cut/src/plan.rs @@ -719,8 +719,7 @@ mod tests { let root = discover_root(cut.clone()).unwrap(); let sui_execution = root.join("sui-execution"); - let move_vm_types = - root.join("external-crates/move/move-execution/shared/crates/move-vm-types"); + let legacy_move_vm_types = root.join("external-crates/move/crates/legacy-move-vm-types"); let ws = Workspace::read(&root).unwrap(); @@ -729,7 +728,7 @@ mod tests { // Other examples assert!(ws.members.contains(&sui_execution)); - assert!(ws.exclude.contains(&move_vm_types)); + assert!(ws.exclude.contains(&legacy_move_vm_types)); } #[test] diff --git a/sui-execution/v0/sui-adapter/Cargo.toml b/sui-execution/v0/sui-adapter/Cargo.toml index 9afc88e4822b6..cf6f0cbd7a69c 100644 --- a/sui-execution/v0/sui-adapter/Cargo.toml +++ b/sui-execution/v0/sui-adapter/Cargo.toml @@ -24,8 +24,8 @@ move-bytecode-verifier-meter.workspace = true move-core-types.workspace = true move-vm-config.workspace = true move-vm-profiler.workspace = true +legacy-move-vm-types.workspace = true -move-vm-types = { path = "../../../external-crates/move/move-execution/shared/crates/move-vm-types" } move-bytecode-verifier = { path = "../../../external-crates/move/move-execution/v0/crates/move-bytecode-verifier", package = "move-bytecode-verifier-v0" } move-vm-runtime = { path = "../../../external-crates/move/move-execution/v0/crates/move-vm-runtime", package = "move-vm-runtime-v0" } sui-move-natives = { path = "../sui-move-natives", package = "sui-move-natives-v0" } diff --git a/sui-execution/v0/sui-adapter/src/error.rs b/sui-execution/v0/sui-adapter/src/error.rs index a686ac319df37..3aaaa42021138 100644 --- a/sui-execution/v0/sui-adapter/src/error.rs +++ b/sui-execution/v0/sui-adapter/src/error.rs @@ -7,7 +7,7 @@ use move_binary_format::{ }; use move_core_types::vm_status::{StatusCode, StatusType}; use move_vm_runtime::move_vm::MoveVM; -use move_vm_types::data_store::MoveResolver; +use legacy_move_vm_types::data_store::MoveResolver; use sui_types::error::{ExecutionError, SuiError}; use sui_types::execution_status::{ExecutionFailureStatus, MoveLocation, MoveLocationOpt}; diff --git a/sui-execution/v0/sui-adapter/src/execution_value.rs b/sui-execution/v0/sui-adapter/src/execution_value.rs index dc40650690922..d7c53a0520322 100644 --- a/sui-execution/v0/sui-adapter/src/execution_value.rs +++ b/sui-execution/v0/sui-adapter/src/execution_value.rs @@ -3,7 +3,7 @@ use move_binary_format::file_format::AbilitySet; use move_core_types::identifier::IdentStr; -use move_vm_types::loaded_data::runtime_types::Type; +use legacy_move_vm_types::loaded_data::runtime_types::Type; use serde::Deserialize; use sui_types::{ base_types::{ObjectID, SequenceNumber, SuiAddress}, diff --git a/sui-execution/v0/sui-adapter/src/programmable_transactions/context.rs b/sui-execution/v0/sui-adapter/src/programmable_transactions/context.rs index e1330021f89ab..c831a9a28d387 100644 --- a/sui-execution/v0/sui-adapter/src/programmable_transactions/context.rs +++ b/sui-execution/v0/sui-adapter/src/programmable_transactions/context.rs @@ -31,7 +31,7 @@ mod checked { language_storage::{ModuleId, StructTag, TypeTag}, }; use move_vm_runtime::{move_vm::MoveVM, session::Session}; - use move_vm_types::loaded_data::runtime_types::Type; + use legacy_move_vm_types::loaded_data::runtime_types::Type; use sui_move_natives::object_runtime::{ self, get_all_uids, max_event_error, ObjectRuntime, RuntimeResults, }; @@ -201,11 +201,11 @@ mod checked { #[skip_checked_arithmetic] move_vm_profiler::tracing_feature_enabled! { use move_vm_profiler::GasProfiler; - use move_vm_types::gas::GasMeter; + use legacy_move_vm_types::gas::GasMeter; let tx_digest = tx_context.digest(); let remaining_gas: u64 = - move_vm_types::gas::GasMeter::remaining_gas(gas_charger.move_gas_status()) + legacy_move_vm_types::gas::GasMeter::remaining_gas(gas_charger.move_gas_status()) .into(); gas_charger .move_gas_status_mut() diff --git a/sui-execution/v0/sui-adapter/src/programmable_transactions/execution.rs b/sui-execution/v0/sui-adapter/src/programmable_transactions/execution.rs index 18b20ada7b3dc..51cfb21dd4bed 100644 --- a/sui-execution/v0/sui-adapter/src/programmable_transactions/execution.rs +++ b/sui-execution/v0/sui-adapter/src/programmable_transactions/execution.rs @@ -34,7 +34,7 @@ mod checked { move_vm::MoveVM, session::{LoadedFunctionInstantiation, SerializedReturnValues}, }; - use move_vm_types::loaded_data::runtime_types::{CachedDatatype, Type}; + use legacy_move_vm_types::loaded_data::runtime_types::{CachedDatatype, Type}; use serde::{de::DeserializeSeed, Deserialize}; use sui_move_natives::object_runtime::ObjectRuntime; use sui_protocol_config::ProtocolConfig; diff --git a/sui-execution/v0/sui-adapter/src/programmable_transactions/linkage_view.rs b/sui-execution/v0/sui-adapter/src/programmable_transactions/linkage_view.rs index d66e03b44f8c5..0bb958b7522dd 100644 --- a/sui-execution/v0/sui-adapter/src/programmable_transactions/linkage_view.rs +++ b/sui-execution/v0/sui-adapter/src/programmable_transactions/linkage_view.rs @@ -14,7 +14,7 @@ use move_core_types::{ language_storage::ModuleId, resolver::{ModuleResolver, SerializedPackage}, }; -use move_vm_types::data_store::LinkageResolver; +use legacy_move_vm_types::data_store::LinkageResolver; use sui_types::storage::{get_module, PackageObject}; use sui_types::{ base_types::ObjectID, diff --git a/sui-execution/v0/sui-adapter/src/type_resolver.rs b/sui-execution/v0/sui-adapter/src/type_resolver.rs index c9227aa01b382..054743af7a341 100644 --- a/sui-execution/v0/sui-adapter/src/type_resolver.rs +++ b/sui-execution/v0/sui-adapter/src/type_resolver.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use move_core_types::language_storage::TypeTag; -use move_vm_types::loaded_data::runtime_types::Type; +use legacy_move_vm_types::loaded_data::runtime_types::Type; use sui_types::error::ExecutionError; pub trait TypeTagResolver { diff --git a/sui-execution/v0/sui-move-natives/Cargo.toml b/sui-execution/v0/sui-move-natives/Cargo.toml index 906b681838ce9..a58b6bbea4aa6 100644 --- a/sui-execution/v0/sui-move-natives/Cargo.toml +++ b/sui-execution/v0/sui-move-natives/Cargo.toml @@ -17,8 +17,8 @@ fastcrypto-zkp.workspace = true fastcrypto.workspace = true move-binary-format.workspace = true move-core-types.workspace = true +legacy-move-vm-types.workspace = true -move-vm-types = { path = "../../../external-crates/move/move-execution/shared/crates/move-vm-types" } move-stdlib-natives = { path = "../../../external-crates/move/move-execution/v0/crates/move-stdlib-natives", package = "move-stdlib-natives-v0" } move-vm-runtime = { path = "../../../external-crates/move/move-execution/v0/crates/move-vm-runtime", package = "move-vm-runtime-v0" } diff --git a/sui-execution/v0/sui-move-natives/src/address.rs b/sui-execution/v0/sui-move-natives/src/address.rs index da1b69b1bc996..9227a9bac4d1e 100644 --- a/sui-execution/v0/sui-move-natives/src/address.rs +++ b/sui-execution/v0/sui-move-natives/src/address.rs @@ -5,7 +5,7 @@ use crate::NativesCostTable; use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas, u256::U256}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v0/sui-move-natives/src/crypto/bls12381.rs b/sui-execution/v0/sui-move-natives/src/crypto/bls12381.rs index 28c1ef5b21864..c8c3e837ae8fe 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/bls12381.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/bls12381.rs @@ -7,7 +7,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_k1.rs b/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_k1.rs index 313df0a08cfca..69b51a471a954 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_k1.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_k1.rs @@ -12,7 +12,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_r1.rs b/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_r1.rs index 9d68fe744dedc..7d9e583ad7313 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_r1.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/ecdsa_r1.rs @@ -14,7 +14,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/ecvrf.rs b/sui-execution/v0/sui-move-natives/src/crypto/ecvrf.rs index 7605d7235391a..d997062d8e2c6 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/ecvrf.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/ecvrf.rs @@ -6,7 +6,7 @@ use fastcrypto::vrf::VRFProof; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/ed25519.rs b/sui-execution/v0/sui-move-natives/src/crypto/ed25519.rs index b082deca9adae..88cee4ca727c6 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/ed25519.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/ed25519.rs @@ -8,7 +8,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/groth16.rs b/sui-execution/v0/sui-move-natives/src/crypto/groth16.rs index f1df54dfd9085..3410063d1d121 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/groth16.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/groth16.rs @@ -4,7 +4,7 @@ use crate::NativesCostTable; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/hash.rs b/sui-execution/v0/sui-move-natives/src/crypto/hash.rs index ac5d5b749165d..3d19be9cf5943 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/hash.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/hash.rs @@ -5,7 +5,7 @@ use fastcrypto::hash::{Blake2b256, HashFunction, Keccak256}; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/crypto/hmac.rs b/sui-execution/v0/sui-move-natives/src/crypto/hmac.rs index 16404a9f8a616..16821f547f1e5 100644 --- a/sui-execution/v0/sui-move-natives/src/crypto/hmac.rs +++ b/sui-execution/v0/sui-move-natives/src/crypto/hmac.rs @@ -5,7 +5,7 @@ use fastcrypto::{hmac, traits::ToFromBytes}; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/dynamic_field.rs b/sui-execution/v0/sui-move-natives/src/dynamic_field.rs index 264d71192cab3..825b28413a83a 100644 --- a/sui-execution/v0/sui-move-natives/src/dynamic_field.rs +++ b/sui-execution/v0/sui-move-natives/src/dynamic_field.rs @@ -17,7 +17,7 @@ use move_core_types::{ }; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/event.rs b/sui-execution/v0/sui-move-natives/src/event.rs index 64e1e1225e077..b4e6f264494fd 100644 --- a/sui-execution/v0/sui-move-natives/src/event.rs +++ b/sui-execution/v0/sui-move-natives/src/event.rs @@ -5,7 +5,7 @@ use crate::{object_runtime::ObjectRuntime, NativesCostTable}; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, language_storage::TypeTag, vm_status::StatusCode}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v0/sui-move-natives/src/lib.rs b/sui-execution/v0/sui-move-natives/src/lib.rs index e524becdbfe30..d759c4f309a78 100644 --- a/sui-execution/v0/sui-move-natives/src/lib.rs +++ b/sui-execution/v0/sui-move-natives/src/lib.rs @@ -38,7 +38,7 @@ use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, identifier::Identifier}; use move_stdlib_natives::{GasParameters, NurseryGasParameters}; use move_vm_runtime::native_functions::{NativeFunction, NativeFunctionTable}; -use move_vm_types::{ +use legacy_move_vm_types::{ natives::function::NativeResult, values::{Struct, Value}, }; diff --git a/sui-execution/v0/sui-move-natives/src/object.rs b/sui-execution/v0/sui-move-natives/src/object.rs index dc7a692faef76..7cce0a86a2637 100644 --- a/sui-execution/v0/sui-move-natives/src/object.rs +++ b/sui-execution/v0/sui-move-natives/src/object.rs @@ -5,7 +5,7 @@ use crate::{object_runtime::ObjectRuntime, NativesCostTable}; use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/object_runtime/mod.rs b/sui-execution/v0/sui-move-natives/src/object_runtime/mod.rs index 0a95c7be772ac..e28e93411299a 100644 --- a/sui-execution/v0/sui-move-natives/src/object_runtime/mod.rs +++ b/sui-execution/v0/sui-move-natives/src/object_runtime/mod.rs @@ -8,7 +8,7 @@ use move_core_types::{ account_address::AccountAddress, annotated_value as A, annotated_visitor as AV, effects::Op, language_storage::StructTag, runtime_value as R, vm_status::StatusCode, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, Value}, }; diff --git a/sui-execution/v0/sui-move-natives/src/object_runtime/object_store.rs b/sui-execution/v0/sui-move-natives/src/object_runtime/object_store.rs index 8bb093b9987f1..a99d6d60910e5 100644 --- a/sui-execution/v0/sui-move-natives/src/object_runtime/object_store.rs +++ b/sui-execution/v0/sui-move-natives/src/object_runtime/object_store.rs @@ -6,7 +6,7 @@ use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{ annotated_value as A, effects::Op, runtime_value as R, vm_status::StatusCode, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, StructRef, Value}, }; diff --git a/sui-execution/v0/sui-move-natives/src/test_scenario.rs b/sui-execution/v0/sui-move-natives/src/test_scenario.rs index 3a6742b540012..e1729010ae5b3 100644 --- a/sui-execution/v0/sui-move-natives/src/test_scenario.rs +++ b/sui-execution/v0/sui-move-natives/src/test_scenario.rs @@ -14,7 +14,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v0/sui-move-natives/src/test_utils.rs b/sui-execution/v0/sui-move-natives/src/test_utils.rs index 11a113871d9a7..c280eb4a9c145 100644 --- a/sui-execution/v0/sui-move-natives/src/test_utils.rs +++ b/sui-execution/v0/sui-move-natives/src/test_utils.rs @@ -5,7 +5,7 @@ use crate::{legacy_test_cost, types::is_otw_struct}; use move_binary_format::errors::PartialVMResult; use move_core_types::{gas_algebra::InternalGas, runtime_value::MoveTypeLayout}; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; @@ -39,7 +39,7 @@ pub fn create_one_time_witness( if is_otw_struct(&struct_layout, &type_tag) { Ok(NativeResult::ok( legacy_test_cost(), - smallvec![Value::struct_(move_vm_types::values::Struct::pack(vec![ + smallvec![Value::struct_(legacy_move_vm_types::values::Struct::pack(vec![ Value::bool(true) ]))], )) diff --git a/sui-execution/v0/sui-move-natives/src/transfer.rs b/sui-execution/v0/sui-move-natives/src/transfer.rs index d6fa07f4a1d00..56fe4b95be7ee 100644 --- a/sui-execution/v0/sui-move-natives/src/transfer.rs +++ b/sui-execution/v0/sui-move-natives/src/transfer.rs @@ -9,7 +9,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v0/sui-move-natives/src/tx_context.rs b/sui-execution/v0/sui-move-natives/src/tx_context.rs index 1a208098b409d..71ac8562779b2 100644 --- a/sui-execution/v0/sui-move-natives/src/tx_context.rs +++ b/sui-execution/v0/sui-move-natives/src/tx_context.rs @@ -4,7 +4,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v0/sui-move-natives/src/types.rs b/sui-execution/v0/sui-move-natives/src/types.rs index 6495ee7f23208..5866727b6e892 100644 --- a/sui-execution/v0/sui-move-natives/src/types.rs +++ b/sui-execution/v0/sui-move-natives/src/types.rs @@ -8,7 +8,7 @@ use move_core_types::{ runtime_value::{MoveStructLayout, MoveTypeLayout}, }; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v0/sui-move-natives/src/validator.rs b/sui-execution/v0/sui-move-natives/src/validator.rs index e6d914acb505b..082da72170925 100644 --- a/sui-execution/v0/sui-move-natives/src/validator.rs +++ b/sui-execution/v0/sui-move-natives/src/validator.rs @@ -5,7 +5,7 @@ use crate::NativesCostTable; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, vm_status::StatusCode}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-adapter/Cargo.toml b/sui-execution/v1/sui-adapter/Cargo.toml index ba017ae9f1de3..36f398db0c1c0 100644 --- a/sui-execution/v1/sui-adapter/Cargo.toml +++ b/sui-execution/v1/sui-adapter/Cargo.toml @@ -22,8 +22,8 @@ move-bytecode-utils.workspace = true move-bytecode-verifier-meter.workspace = true move-core-types.workspace = true move-vm-config.workspace = true +legacy-move-vm-types.workspace = true -move-vm-types = { path = "../../../external-crates/move/move-execution/shared/crates/move-vm-types" } move-bytecode-verifier = { path = "../../../external-crates/move/move-execution/v1/crates/move-bytecode-verifier", package = "move-bytecode-verifier-v1" } move-vm-runtime = { path = "../../../external-crates/move/move-execution/v1/crates/move-vm-runtime", package = "move-vm-runtime-v1" } move-vm-profiler = { path = "../../../external-crates/move/crates/move-vm-profiler" } diff --git a/sui-execution/v1/sui-adapter/src/error.rs b/sui-execution/v1/sui-adapter/src/error.rs index a686ac319df37..3aaaa42021138 100644 --- a/sui-execution/v1/sui-adapter/src/error.rs +++ b/sui-execution/v1/sui-adapter/src/error.rs @@ -7,7 +7,7 @@ use move_binary_format::{ }; use move_core_types::vm_status::{StatusCode, StatusType}; use move_vm_runtime::move_vm::MoveVM; -use move_vm_types::data_store::MoveResolver; +use legacy_move_vm_types::data_store::MoveResolver; use sui_types::error::{ExecutionError, SuiError}; use sui_types::execution_status::{ExecutionFailureStatus, MoveLocation, MoveLocationOpt}; diff --git a/sui-execution/v1/sui-adapter/src/execution_value.rs b/sui-execution/v1/sui-adapter/src/execution_value.rs index dc40650690922..d7c53a0520322 100644 --- a/sui-execution/v1/sui-adapter/src/execution_value.rs +++ b/sui-execution/v1/sui-adapter/src/execution_value.rs @@ -3,7 +3,7 @@ use move_binary_format::file_format::AbilitySet; use move_core_types::identifier::IdentStr; -use move_vm_types::loaded_data::runtime_types::Type; +use legacy_move_vm_types::loaded_data::runtime_types::Type; use serde::Deserialize; use sui_types::{ base_types::{ObjectID, SequenceNumber, SuiAddress}, diff --git a/sui-execution/v1/sui-adapter/src/programmable_transactions/context.rs b/sui-execution/v1/sui-adapter/src/programmable_transactions/context.rs index 31e4451bb62ca..e237f2c64e660 100644 --- a/sui-execution/v1/sui-adapter/src/programmable_transactions/context.rs +++ b/sui-execution/v1/sui-adapter/src/programmable_transactions/context.rs @@ -39,8 +39,8 @@ mod checked { move_vm::MoveVM, session::{LoadedFunctionInstantiation, SerializedReturnValues}, }; - use move_vm_types::data_store::DataStore; - use move_vm_types::loaded_data::runtime_types::Type; + use legacy_move_vm_types::data_store::DataStore; + use legacy_move_vm_types::loaded_data::runtime_types::Type; use sui_move_natives::object_runtime::{ self, get_all_uids, max_event_error, LoadedRuntimeObject, ObjectRuntime, RuntimeResults, }; @@ -192,11 +192,11 @@ mod checked { #[skip_checked_arithmetic] move_vm_profiler::tracing_feature_enabled! { use move_vm_profiler::GasProfiler; - use move_vm_types::gas::GasMeter; + use legacy_move_vm_types::gas::GasMeter; let tx_digest = tx_context.digest(); let remaining_gas: u64 = - move_vm_types::gas::GasMeter::remaining_gas(gas_charger.move_gas_status()) + legacy_move_vm_types::gas::GasMeter::remaining_gas(gas_charger.move_gas_status()) .into(); gas_charger .move_gas_status_mut() diff --git a/sui-execution/v1/sui-adapter/src/programmable_transactions/execution.rs b/sui-execution/v1/sui-adapter/src/programmable_transactions/execution.rs index e0ec4766306f7..17f903a4c02df 100644 --- a/sui-execution/v1/sui-adapter/src/programmable_transactions/execution.rs +++ b/sui-execution/v1/sui-adapter/src/programmable_transactions/execution.rs @@ -27,7 +27,7 @@ mod checked { move_vm::MoveVM, session::{LoadedFunctionInstantiation, SerializedReturnValues}, }; - use move_vm_types::loaded_data::runtime_types::{CachedDatatype, Type}; + use legacy_move_vm_types::loaded_data::runtime_types::{CachedDatatype, Type}; use serde::{de::DeserializeSeed, Deserialize}; use std::{ collections::{BTreeMap, BTreeSet}, diff --git a/sui-execution/v1/sui-adapter/src/programmable_transactions/linkage_view.rs b/sui-execution/v1/sui-adapter/src/programmable_transactions/linkage_view.rs index f059b59dc8bcb..421efe12f7fdb 100644 --- a/sui-execution/v1/sui-adapter/src/programmable_transactions/linkage_view.rs +++ b/sui-execution/v1/sui-adapter/src/programmable_transactions/linkage_view.rs @@ -14,7 +14,7 @@ use move_core_types::{ language_storage::ModuleId, resolver::ModuleResolver, }; -use move_vm_types::data_store::LinkageResolver; +use legacy_move_vm_types::data_store::LinkageResolver; use sui_types::storage::{get_module, PackageObject}; use sui_types::{ base_types::ObjectID, diff --git a/sui-execution/v1/sui-adapter/src/type_resolver.rs b/sui-execution/v1/sui-adapter/src/type_resolver.rs index c9227aa01b382..054743af7a341 100644 --- a/sui-execution/v1/sui-adapter/src/type_resolver.rs +++ b/sui-execution/v1/sui-adapter/src/type_resolver.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use move_core_types::language_storage::TypeTag; -use move_vm_types::loaded_data::runtime_types::Type; +use legacy_move_vm_types::loaded_data::runtime_types::Type; use sui_types::error::ExecutionError; pub trait TypeTagResolver { diff --git a/sui-execution/v1/sui-move-natives/Cargo.toml b/sui-execution/v1/sui-move-natives/Cargo.toml index 26057c0b060b4..ba4c6464432a8 100644 --- a/sui-execution/v1/sui-move-natives/Cargo.toml +++ b/sui-execution/v1/sui-move-natives/Cargo.toml @@ -17,8 +17,8 @@ fastcrypto-zkp.workspace = true fastcrypto.workspace = true move-binary-format.workspace = true move-core-types.workspace = true +legacy-move-vm-types.workspace = true -move-vm-types = { path = "../../../external-crates/move/move-execution/shared/crates/move-vm-types" } move-stdlib-natives = { path = "../../../external-crates/move/move-execution/v1/crates/move-stdlib-natives", package = "move-stdlib-natives-v1" } move-vm-runtime = { path = "../../../external-crates/move/move-execution/v1/crates/move-vm-runtime", package = "move-vm-runtime-v1" } diff --git a/sui-execution/v1/sui-move-natives/src/address.rs b/sui-execution/v1/sui-move-natives/src/address.rs index da1b69b1bc996..9227a9bac4d1e 100644 --- a/sui-execution/v1/sui-move-natives/src/address.rs +++ b/sui-execution/v1/sui-move-natives/src/address.rs @@ -5,7 +5,7 @@ use crate::NativesCostTable; use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas, u256::U256}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-move-natives/src/crypto/bls12381.rs b/sui-execution/v1/sui-move-natives/src/crypto/bls12381.rs index 28c1ef5b21864..c8c3e837ae8fe 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/bls12381.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/bls12381.rs @@ -7,7 +7,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_k1.rs b/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_k1.rs index 313df0a08cfca..69b51a471a954 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_k1.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_k1.rs @@ -12,7 +12,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_r1.rs b/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_r1.rs index 9d68fe744dedc..7d9e583ad7313 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_r1.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/ecdsa_r1.rs @@ -14,7 +14,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/ecvrf.rs b/sui-execution/v1/sui-move-natives/src/crypto/ecvrf.rs index 7605d7235391a..d997062d8e2c6 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/ecvrf.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/ecvrf.rs @@ -6,7 +6,7 @@ use fastcrypto::vrf::VRFProof; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/ed25519.rs b/sui-execution/v1/sui-move-natives/src/crypto/ed25519.rs index b082deca9adae..88cee4ca727c6 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/ed25519.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/ed25519.rs @@ -8,7 +8,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/groth16.rs b/sui-execution/v1/sui-move-natives/src/crypto/groth16.rs index f1df54dfd9085..3410063d1d121 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/groth16.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/groth16.rs @@ -4,7 +4,7 @@ use crate::NativesCostTable; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/hash.rs b/sui-execution/v1/sui-move-natives/src/crypto/hash.rs index ac5d5b749165d..3d19be9cf5943 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/hash.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/hash.rs @@ -5,7 +5,7 @@ use fastcrypto::hash::{Blake2b256, HashFunction, Keccak256}; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/hmac.rs b/sui-execution/v1/sui-move-natives/src/crypto/hmac.rs index 16404a9f8a616..16821f547f1e5 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/hmac.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/hmac.rs @@ -5,7 +5,7 @@ use fastcrypto::{hmac, traits::ToFromBytes}; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/crypto/zklogin.rs b/sui-execution/v1/sui-move-natives/src/crypto/zklogin.rs index e0288f507da67..b615168aced54 100644 --- a/sui-execution/v1/sui-move-natives/src/crypto/zklogin.rs +++ b/sui-execution/v1/sui-move-natives/src/crypto/zklogin.rs @@ -8,9 +8,9 @@ use move_core_types::gas_algebra::InternalGas; use move_core_types::u256::U256; use move_core_types::vm_status::StatusCode; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::natives::function::PartialVMError; -use move_vm_types::values::VectorRef; -use move_vm_types::{ +use legacy_move_vm_types::natives::function::PartialVMError; +use legacy_move_vm_types::values::VectorRef; +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-move-natives/src/dynamic_field.rs b/sui-execution/v1/sui-move-natives/src/dynamic_field.rs index ba37beef3f014..789d3a0098ec0 100644 --- a/sui-execution/v1/sui-move-natives/src/dynamic_field.rs +++ b/sui-execution/v1/sui-move-natives/src/dynamic_field.rs @@ -15,7 +15,7 @@ use move_core_types::{ }; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/event.rs b/sui-execution/v1/sui-move-natives/src/event.rs index 6cd56a2282338..9717783b460f2 100644 --- a/sui-execution/v1/sui-move-natives/src/event.rs +++ b/sui-execution/v1/sui-move-natives/src/event.rs @@ -5,7 +5,7 @@ use crate::{object_runtime::ObjectRuntime, NativesCostTable}; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, language_storage::TypeTag, vm_status::StatusCode}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-move-natives/src/lib.rs b/sui-execution/v1/sui-move-natives/src/lib.rs index 8a3621a1df8ea..96c65e8016d25 100644 --- a/sui-execution/v1/sui-move-natives/src/lib.rs +++ b/sui-execution/v1/sui-move-natives/src/lib.rs @@ -47,7 +47,7 @@ use move_core_types::{ }; use move_stdlib_natives::{GasParameters, NurseryGasParameters}; use move_vm_runtime::native_functions::{NativeContext, NativeFunction, NativeFunctionTable}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::{Struct, Value}, diff --git a/sui-execution/v1/sui-move-natives/src/object.rs b/sui-execution/v1/sui-move-natives/src/object.rs index dc7a692faef76..7cce0a86a2637 100644 --- a/sui-execution/v1/sui-move-natives/src/object.rs +++ b/sui-execution/v1/sui-move-natives/src/object.rs @@ -5,7 +5,7 @@ use crate::{object_runtime::ObjectRuntime, NativesCostTable}; use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/object_runtime/mod.rs b/sui-execution/v1/sui-move-natives/src/object_runtime/mod.rs index 0ca90b8ed32ba..e9c504d5a04c7 100644 --- a/sui-execution/v1/sui-move-natives/src/object_runtime/mod.rs +++ b/sui-execution/v1/sui-move-natives/src/object_runtime/mod.rs @@ -13,7 +13,7 @@ use move_core_types::{ runtime_value as R, vm_status::StatusCode, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, Value}, }; diff --git a/sui-execution/v1/sui-move-natives/src/object_runtime/object_store.rs b/sui-execution/v1/sui-move-natives/src/object_runtime/object_store.rs index 09b576d1cb5b3..568c64620f4e4 100644 --- a/sui-execution/v1/sui-move-natives/src/object_runtime/object_store.rs +++ b/sui-execution/v1/sui-move-natives/src/object_runtime/object_store.rs @@ -6,7 +6,7 @@ use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{ annotated_value as A, effects::Op, runtime_value as R, vm_status::StatusCode, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, StructRef, Value}, }; diff --git a/sui-execution/v1/sui-move-natives/src/test_scenario.rs b/sui-execution/v1/sui-move-natives/src/test_scenario.rs index a268688009737..4c99514111c30 100644 --- a/sui-execution/v1/sui-move-natives/src/test_scenario.rs +++ b/sui-execution/v1/sui-move-natives/src/test_scenario.rs @@ -14,7 +14,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v1/sui-move-natives/src/test_utils.rs b/sui-execution/v1/sui-move-natives/src/test_utils.rs index 11a113871d9a7..c280eb4a9c145 100644 --- a/sui-execution/v1/sui-move-natives/src/test_utils.rs +++ b/sui-execution/v1/sui-move-natives/src/test_utils.rs @@ -5,7 +5,7 @@ use crate::{legacy_test_cost, types::is_otw_struct}; use move_binary_format::errors::PartialVMResult; use move_core_types::{gas_algebra::InternalGas, runtime_value::MoveTypeLayout}; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; @@ -39,7 +39,7 @@ pub fn create_one_time_witness( if is_otw_struct(&struct_layout, &type_tag) { Ok(NativeResult::ok( legacy_test_cost(), - smallvec![Value::struct_(move_vm_types::values::Struct::pack(vec![ + smallvec![Value::struct_(legacy_move_vm_types::values::Struct::pack(vec![ Value::bool(true) ]))], )) diff --git a/sui-execution/v1/sui-move-natives/src/transfer.rs b/sui-execution/v1/sui-move-natives/src/transfer.rs index 2a1ba3e244391..5e09f14acdf0e 100644 --- a/sui-execution/v1/sui-move-natives/src/transfer.rs +++ b/sui-execution/v1/sui-move-natives/src/transfer.rs @@ -12,7 +12,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-move-natives/src/tx_context.rs b/sui-execution/v1/sui-move-natives/src/tx_context.rs index 1a208098b409d..71ac8562779b2 100644 --- a/sui-execution/v1/sui-move-natives/src/tx_context.rs +++ b/sui-execution/v1/sui-move-natives/src/tx_context.rs @@ -4,7 +4,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-move-natives/src/types.rs b/sui-execution/v1/sui-move-natives/src/types.rs index 6495ee7f23208..5866727b6e892 100644 --- a/sui-execution/v1/sui-move-natives/src/types.rs +++ b/sui-execution/v1/sui-move-natives/src/types.rs @@ -8,7 +8,7 @@ use move_core_types::{ runtime_value::{MoveStructLayout, MoveTypeLayout}, }; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v1/sui-move-natives/src/validator.rs b/sui-execution/v1/sui-move-natives/src/validator.rs index e6d914acb505b..082da72170925 100644 --- a/sui-execution/v1/sui-move-natives/src/validator.rs +++ b/sui-execution/v1/sui-move-natives/src/validator.rs @@ -5,7 +5,7 @@ use crate::NativesCostTable; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, vm_status::StatusCode}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-adapter/Cargo.toml b/sui-execution/v2/sui-adapter/Cargo.toml index f266c9adc6459..bef2ae1383aaa 100644 --- a/sui-execution/v2/sui-adapter/Cargo.toml +++ b/sui-execution/v2/sui-adapter/Cargo.toml @@ -22,8 +22,8 @@ move-bytecode-utils.workspace = true move-bytecode-verifier-meter.workspace = true move-core-types.workspace = true move-vm-config.workspace = true +legacy-move-vm-types.workspace = true -move-vm-types = { path = "../../../external-crates/move/move-execution/shared/crates/move-vm-types" } move-bytecode-verifier = { path = "../../../external-crates/move/move-execution/v2/crates/move-bytecode-verifier", package = "move-bytecode-verifier-v2" } move-vm-runtime = { path = "../../../external-crates/move/move-execution/v2/crates/move-vm-runtime", package = "move-vm-runtime-v2" } move-vm-profiler = { path = "../../../external-crates/move/crates/move-vm-profiler" } diff --git a/sui-execution/v2/sui-adapter/src/error.rs b/sui-execution/v2/sui-adapter/src/error.rs index a686ac319df37..3aaaa42021138 100644 --- a/sui-execution/v2/sui-adapter/src/error.rs +++ b/sui-execution/v2/sui-adapter/src/error.rs @@ -7,7 +7,7 @@ use move_binary_format::{ }; use move_core_types::vm_status::{StatusCode, StatusType}; use move_vm_runtime::move_vm::MoveVM; -use move_vm_types::data_store::MoveResolver; +use legacy_move_vm_types::data_store::MoveResolver; use sui_types::error::{ExecutionError, SuiError}; use sui_types::execution_status::{ExecutionFailureStatus, MoveLocation, MoveLocationOpt}; diff --git a/sui-execution/v2/sui-adapter/src/execution_value.rs b/sui-execution/v2/sui-adapter/src/execution_value.rs index dc40650690922..d7c53a0520322 100644 --- a/sui-execution/v2/sui-adapter/src/execution_value.rs +++ b/sui-execution/v2/sui-adapter/src/execution_value.rs @@ -3,7 +3,7 @@ use move_binary_format::file_format::AbilitySet; use move_core_types::identifier::IdentStr; -use move_vm_types::loaded_data::runtime_types::Type; +use legacy_move_vm_types::loaded_data::runtime_types::Type; use serde::Deserialize; use sui_types::{ base_types::{ObjectID, SequenceNumber, SuiAddress}, diff --git a/sui-execution/v2/sui-adapter/src/programmable_transactions/context.rs b/sui-execution/v2/sui-adapter/src/programmable_transactions/context.rs index 4cfeabce157be..ea328607c5887 100644 --- a/sui-execution/v2/sui-adapter/src/programmable_transactions/context.rs +++ b/sui-execution/v2/sui-adapter/src/programmable_transactions/context.rs @@ -40,8 +40,8 @@ mod checked { move_vm::MoveVM, session::{LoadedFunctionInstantiation, SerializedReturnValues}, }; - use move_vm_types::data_store::DataStore; - use move_vm_types::loaded_data::runtime_types::Type; + use legacy_move_vm_types::data_store::DataStore; + use legacy_move_vm_types::loaded_data::runtime_types::Type; use sui_move_natives::object_runtime::{ self, get_all_uids, max_event_error, LoadedRuntimeObject, ObjectRuntime, RuntimeResults, }; @@ -196,11 +196,11 @@ mod checked { #[skip_checked_arithmetic] move_vm_profiler::tracing_feature_enabled! { use move_vm_profiler::GasProfiler; - use move_vm_types::gas::GasMeter; + use legacy_move_vm_types::gas::GasMeter; let tx_digest = tx_context.digest(); let remaining_gas: u64 = - move_vm_types::gas::GasMeter::remaining_gas(gas_charger.move_gas_status()) + legacy_move_vm_types::gas::GasMeter::remaining_gas(gas_charger.move_gas_status()) .into(); gas_charger .move_gas_status_mut() diff --git a/sui-execution/v2/sui-adapter/src/programmable_transactions/execution.rs b/sui-execution/v2/sui-adapter/src/programmable_transactions/execution.rs index ac751d9d4a72c..f2ae9b6f8a10d 100644 --- a/sui-execution/v2/sui-adapter/src/programmable_transactions/execution.rs +++ b/sui-execution/v2/sui-adapter/src/programmable_transactions/execution.rs @@ -27,7 +27,7 @@ mod checked { move_vm::MoveVM, session::{LoadedFunctionInstantiation, SerializedReturnValues}, }; - use move_vm_types::loaded_data::runtime_types::{CachedDatatype, Type}; + use legacy_move_vm_types::loaded_data::runtime_types::{CachedDatatype, Type}; use serde::{de::DeserializeSeed, Deserialize}; use std::{ collections::{BTreeMap, BTreeSet}, diff --git a/sui-execution/v2/sui-adapter/src/programmable_transactions/linkage_view.rs b/sui-execution/v2/sui-adapter/src/programmable_transactions/linkage_view.rs index dedc553a53861..b29554e42512a 100644 --- a/sui-execution/v2/sui-adapter/src/programmable_transactions/linkage_view.rs +++ b/sui-execution/v2/sui-adapter/src/programmable_transactions/linkage_view.rs @@ -14,7 +14,7 @@ use move_core_types::{ language_storage::ModuleId, resolver::ModuleResolver, }; -use move_vm_types::data_store::LinkageResolver; +use legacy_move_vm_types::data_store::LinkageResolver; use sui_types::storage::{get_module, PackageObject}; use sui_types::{ base_types::ObjectID, diff --git a/sui-execution/v2/sui-adapter/src/type_resolver.rs b/sui-execution/v2/sui-adapter/src/type_resolver.rs index c9227aa01b382..054743af7a341 100644 --- a/sui-execution/v2/sui-adapter/src/type_resolver.rs +++ b/sui-execution/v2/sui-adapter/src/type_resolver.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use move_core_types::language_storage::TypeTag; -use move_vm_types::loaded_data::runtime_types::Type; +use legacy_move_vm_types::loaded_data::runtime_types::Type; use sui_types::error::ExecutionError; pub trait TypeTagResolver { diff --git a/sui-execution/v2/sui-move-natives/Cargo.toml b/sui-execution/v2/sui-move-natives/Cargo.toml index 5cad43753dcfb..0a38812482fcd 100644 --- a/sui-execution/v2/sui-move-natives/Cargo.toml +++ b/sui-execution/v2/sui-move-natives/Cargo.toml @@ -17,8 +17,8 @@ fastcrypto-zkp.workspace = true fastcrypto.workspace = true move-binary-format.workspace = true move-core-types.workspace = true +legacy-move-vm-types.workspace = true -move-vm-types = { path = "../../../external-crates/move/move-execution/shared/crates/move-vm-types" } move-stdlib-natives = { path = "../../../external-crates/move/move-execution/v2/crates/move-stdlib-natives", package = "move-stdlib-natives-v2" } move-vm-runtime = { path = "../../../external-crates/move/move-execution/v2/crates/move-vm-runtime", package = "move-vm-runtime-v2" } diff --git a/sui-execution/v2/sui-move-natives/src/address.rs b/sui-execution/v2/sui-move-natives/src/address.rs index da1b69b1bc996..9227a9bac4d1e 100644 --- a/sui-execution/v2/sui-move-natives/src/address.rs +++ b/sui-execution/v2/sui-move-natives/src/address.rs @@ -5,7 +5,7 @@ use crate::NativesCostTable; use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas, u256::U256}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-move-natives/src/crypto/bls12381.rs b/sui-execution/v2/sui-move-natives/src/crypto/bls12381.rs index 28c1ef5b21864..c8c3e837ae8fe 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/bls12381.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/bls12381.rs @@ -7,7 +7,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_k1.rs b/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_k1.rs index 313df0a08cfca..69b51a471a954 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_k1.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_k1.rs @@ -12,7 +12,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_r1.rs b/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_r1.rs index 9d68fe744dedc..7d9e583ad7313 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_r1.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/ecdsa_r1.rs @@ -14,7 +14,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/ecvrf.rs b/sui-execution/v2/sui-move-natives/src/crypto/ecvrf.rs index 7605d7235391a..d997062d8e2c6 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/ecvrf.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/ecvrf.rs @@ -6,7 +6,7 @@ use fastcrypto::vrf::VRFProof; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/ed25519.rs b/sui-execution/v2/sui-move-natives/src/crypto/ed25519.rs index b082deca9adae..88cee4ca727c6 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/ed25519.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/ed25519.rs @@ -8,7 +8,7 @@ use fastcrypto::{ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/groth16.rs b/sui-execution/v2/sui-move-natives/src/crypto/groth16.rs index f1df54dfd9085..3410063d1d121 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/groth16.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/groth16.rs @@ -4,7 +4,7 @@ use crate::NativesCostTable; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs b/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs index 8f1e459486371..4239a2ebf5e94 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs @@ -13,7 +13,7 @@ use move_core_types::gas_algebra::InternalGas; use move_core_types::vm_status::StatusCode; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/hash.rs b/sui-execution/v2/sui-move-natives/src/crypto/hash.rs index ac5d5b749165d..3d19be9cf5943 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/hash.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/hash.rs @@ -5,7 +5,7 @@ use fastcrypto::hash::{Blake2b256, HashFunction, Keccak256}; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/hmac.rs b/sui-execution/v2/sui-move-natives/src/crypto/hmac.rs index 16404a9f8a616..16821f547f1e5 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/hmac.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/hmac.rs @@ -5,7 +5,7 @@ use fastcrypto::{hmac, traits::ToFromBytes}; use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/poseidon.rs b/sui-execution/v2/sui-move-natives/src/crypto/poseidon.rs index abe6bfd7f76e3..2ab702d019af8 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/poseidon.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/poseidon.rs @@ -7,8 +7,8 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::gas_algebra::InternalGas; use move_core_types::vm_status::StatusCode; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::natives::function::PartialVMError; -use move_vm_types::{ +use legacy_move_vm_types::natives::function::PartialVMError; +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/crypto/zklogin.rs b/sui-execution/v2/sui-move-natives/src/crypto/zklogin.rs index e0288f507da67..b615168aced54 100644 --- a/sui-execution/v2/sui-move-natives/src/crypto/zklogin.rs +++ b/sui-execution/v2/sui-move-natives/src/crypto/zklogin.rs @@ -8,9 +8,9 @@ use move_core_types::gas_algebra::InternalGas; use move_core_types::u256::U256; use move_core_types::vm_status::StatusCode; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::natives::function::PartialVMError; -use move_vm_types::values::VectorRef; -use move_vm_types::{ +use legacy_move_vm_types::natives::function::PartialVMError; +use legacy_move_vm_types::values::VectorRef; +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-move-natives/src/dynamic_field.rs b/sui-execution/v2/sui-move-natives/src/dynamic_field.rs index ba37beef3f014..789d3a0098ec0 100644 --- a/sui-execution/v2/sui-move-natives/src/dynamic_field.rs +++ b/sui-execution/v2/sui-move-natives/src/dynamic_field.rs @@ -15,7 +15,7 @@ use move_core_types::{ }; use move_vm_runtime::native_charge_gas_early_exit; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/event.rs b/sui-execution/v2/sui-move-natives/src/event.rs index f06156cedbd6d..4422735f386b3 100644 --- a/sui-execution/v2/sui-move-natives/src/event.rs +++ b/sui-execution/v2/sui-move-natives/src/event.rs @@ -5,7 +5,7 @@ use crate::{object_runtime::ObjectRuntime, NativesCostTable}; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, language_storage::TypeTag, vm_status::StatusCode}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-move-natives/src/lib.rs b/sui-execution/v2/sui-move-natives/src/lib.rs index d4147e52d11d2..363e09ac4e66b 100644 --- a/sui-execution/v2/sui-move-natives/src/lib.rs +++ b/sui-execution/v2/sui-move-natives/src/lib.rs @@ -51,7 +51,7 @@ use move_core_types::{ }; use move_stdlib_natives::{GasParameters, NurseryGasParameters}; use move_vm_runtime::native_functions::{NativeContext, NativeFunction, NativeFunctionTable}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::{Struct, Value}, diff --git a/sui-execution/v2/sui-move-natives/src/object.rs b/sui-execution/v2/sui-move-natives/src/object.rs index dc7a692faef76..7cce0a86a2637 100644 --- a/sui-execution/v2/sui-move-natives/src/object.rs +++ b/sui-execution/v2/sui-move-natives/src/object.rs @@ -5,7 +5,7 @@ use crate::{object_runtime::ObjectRuntime, NativesCostTable}; use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/object_runtime/mod.rs b/sui-execution/v2/sui-move-natives/src/object_runtime/mod.rs index 68060fefcb7ab..52b325092e209 100644 --- a/sui-execution/v2/sui-move-natives/src/object_runtime/mod.rs +++ b/sui-execution/v2/sui-move-natives/src/object_runtime/mod.rs @@ -18,7 +18,7 @@ use move_core_types::{ runtime_value as R, vm_status::StatusCode, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, Value}, }; diff --git a/sui-execution/v2/sui-move-natives/src/object_runtime/object_store.rs b/sui-execution/v2/sui-move-natives/src/object_runtime/object_store.rs index 7d977efac9623..f3bc0e5576b2a 100644 --- a/sui-execution/v2/sui-move-natives/src/object_runtime/object_store.rs +++ b/sui-execution/v2/sui-move-natives/src/object_runtime/object_store.rs @@ -6,7 +6,7 @@ use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{ annotated_value as A, effects::Op, runtime_value as R, vm_status::StatusCode, }; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, values::{GlobalValue, StructRef, Value}, }; diff --git a/sui-execution/v2/sui-move-natives/src/test_scenario.rs b/sui-execution/v2/sui-move-natives/src/test_scenario.rs index 9c8cb8b8783be..dc161487a7411 100644 --- a/sui-execution/v2/sui-move-natives/src/test_scenario.rs +++ b/sui-execution/v2/sui-move-natives/src/test_scenario.rs @@ -14,7 +14,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, diff --git a/sui-execution/v2/sui-move-natives/src/test_utils.rs b/sui-execution/v2/sui-move-natives/src/test_utils.rs index 7072e6c42b7eb..f8cb163c7ad36 100644 --- a/sui-execution/v2/sui-move-natives/src/test_utils.rs +++ b/sui-execution/v2/sui-move-natives/src/test_utils.rs @@ -5,7 +5,7 @@ use crate::{legacy_test_cost, types::is_otw_struct}; use move_binary_format::errors::PartialVMResult; use move_core_types::{gas_algebra::InternalGas, runtime_value::MoveTypeLayout}; use move_vm_runtime::native_functions::NativeContext; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; @@ -40,7 +40,7 @@ pub fn create_one_time_witness( if is_otw_struct(&struct_layout, &type_tag, hardened_check) { Ok(NativeResult::ok( legacy_test_cost(), - smallvec![Value::struct_(move_vm_types::values::Struct::pack(vec![ + smallvec![Value::struct_(legacy_move_vm_types::values::Struct::pack(vec![ Value::bool(true) ]))], )) diff --git a/sui-execution/v2/sui-move-natives/src/transfer.rs b/sui-execution/v2/sui-move-natives/src/transfer.rs index 2a1ba3e244391..5e09f14acdf0e 100644 --- a/sui-execution/v2/sui-move-natives/src/transfer.rs +++ b/sui-execution/v2/sui-move-natives/src/transfer.rs @@ -12,7 +12,7 @@ use move_core_types::{ vm_status::StatusCode, }; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-move-natives/src/tx_context.rs b/sui-execution/v2/sui-move-natives/src/tx_context.rs index 1a208098b409d..71ac8562779b2 100644 --- a/sui-execution/v2/sui-move-natives/src/tx_context.rs +++ b/sui-execution/v2/sui-move-natives/src/tx_context.rs @@ -4,7 +4,7 @@ use move_binary_format::errors::PartialVMResult; use move_core_types::{account_address::AccountAddress, gas_algebra::InternalGas}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-move-natives/src/types.rs b/sui-execution/v2/sui-move-natives/src/types.rs index 41b1ae6a916d6..1df39a49caeea 100644 --- a/sui-execution/v2/sui-move-natives/src/types.rs +++ b/sui-execution/v2/sui-move-natives/src/types.rs @@ -8,7 +8,7 @@ use move_core_types::{ runtime_value::{MoveStructLayout, MoveTypeLayout}, }; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value, }; use smallvec::smallvec; diff --git a/sui-execution/v2/sui-move-natives/src/validator.rs b/sui-execution/v2/sui-move-natives/src/validator.rs index e6d914acb505b..082da72170925 100644 --- a/sui-execution/v2/sui-move-natives/src/validator.rs +++ b/sui-execution/v2/sui-move-natives/src/validator.rs @@ -5,7 +5,7 @@ use crate::NativesCostTable; use move_binary_format::errors::{PartialVMError, PartialVMResult}; use move_core_types::{gas_algebra::InternalGas, vm_status::StatusCode}; use move_vm_runtime::{native_charge_gas_early_exit, native_functions::NativeContext}; -use move_vm_types::{ +use legacy_move_vm_types::{ loaded_data::runtime_types::Type, natives::function::NativeResult, pop_arg, values::Value, }; use smallvec::smallvec;