LoaderV2 integration

.cargo/config.toml

@@ -1,4 +1,4 @@
 [env]
 
 RUST_BIGDECIMAL_FMT_EXPONENTIAL_UPPER_THRESHOLD="100"
-RUST_BIGDECIMAL_FMT_EXPONENTIAL_LOWER_THRESHOLD="100"
+RUST_BIGDECIMAL_FMT_EXPONENTIAL_LOWER_THRESHOLD="100"

.github/workflows/lint.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.77.1
+          toolchain: 1.80.1
           override: true
           components: rustfmt, clippy
       - uses: actions/setup-go@v4

.github/workflows/test.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.77.1
+          toolchain: 1.80.1
       - name: Build Rust
         run: make build-rust
       - uses: actions/setup-go@v4

Cargo.toml

@@ -49,7 +49,7 @@ license = "BUSL-1.1"
 license-file = "LICENSE"
 homepage = "https://initia.xyz"
 repository = "https://github.com/initia-labs/movevm"
-rust-version = "1.77.1"
+rust-version = "1.80.1"
 
 [workspace.dependencies]
 # Internal crate dependencies.
@@ -65,9 +65,11 @@ initia-move-resource-viewer = { path = "crates/resource-viewer" }
 
 # External crate dependencies.
 # Please do not add any test features here: they should be declared by the individual crate.
-anyhow = "1.0.41"
-bcs = "0.1.5"
+ambassador = "0.4.1"
+anyhow = "1.0.71"
+bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
 better_any = "0.1.1"
+claims = "0.7"
 clru = "^0.6.2"
 cbindgen = "0.26.0"
 clap = { version = "4.3.9", features = ["derive", "env", "suggestions"] }
@@ -76,7 +78,7 @@ dialoguer = "0.10.2"
 ed25519-consensus = { version = "2.0.1", features = ["serde"] }
 errno = "0.3.0"
 hex = { version = "0.4.3", default-features = false }
-itertools = "0.10.3"
+itertools = "0.13"
 libsecp256k1 = { version = "0.7.1" }
 log = { version = "0.4.17", features = [
     "max_level_debug",
@@ -95,68 +97,70 @@ serde-generate = { git = "https://github.com/aptos-labs/serde-reflection", rev =
 serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
 sha2 = "0.10.8"
 sha3 = "0.10.6"
-smallvec = "1.6.1"
+smallvec = "1.8.0"
 smallbitvec = "2.5.1"
-tempfile = "3.2.0"
+tempfile = "3.3.0"
 serial_test = "1.0.0"
-thiserror = "1.0.34"
+thiserror = "1.0.37"
 tsu = "1.0.1"
 bytes = "1.4.0"
 parking_lot = "0.12.1"
 base64 = "0.21.7"
 bigdecimal = ">=0.4.5"
+primitive-types = { version = "0.10" }
 bech32 = "0.11"
 triomphe = "0.1.9"
 tiny-keccak = { version = "2.0.2", features = ["keccak", "sha3"] }
+get-size = { version = "0.1.4", features = ["derive"]}
 
 # Note: the BEGIN and END comments below are required for external tooling. Do not remove.
 # BEGIN MOVE DEPENDENCIES
 
-move-binary-format = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-bytecode-verifier = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-cli = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-command-line-common = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-compiler = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-coverage = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-core-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-docgen = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-model = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-package = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-prover = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-prover-boogie-backend = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-prover-bytecode-pipeline = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-stackless-bytecode = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-stdlib = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-symbol-pool = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-unit-test = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
-move-vm-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "85966af7ddcf971f3f04f4f409c3e67c9d9b11cb" }
+move-binary-format = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-bytecode-verifier = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-cli = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-command-line-common = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-compiler = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-coverage = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-core-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-docgen = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-model = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-package = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-prover = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-prover-boogie-backend = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-prover-bytecode-pipeline = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-stackless-bytecode = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-stdlib = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-symbol-pool = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-unit-test = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
+move-vm-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "7131086965eb19c1c7f35b2003d2a5637691f108" }
 
 # END MOVE DEPENDENCIES
 
 # FOR LOCAL DEVELOPMENNT
-# move-binary-format = { path = "../aptos-core/third_party/move/move-binary-format" }
-# move-bytecode-verifier = { path = "../aptos-core/third_party/move/move-bytecode-verifier" }
-# move-bytecode-utils = { path = "../aptos-core/third_party/move/tools/move-bytecode-utils" }
-# move-cli = { path = "../aptos-core/third_party/move/tools/move-cli" }
-# move-command-line-common = { path = "../aptos-core/third_party/move/move-command-line-common" }
-# move-compiler = { path = "../aptos-core/third_party/move/move-compiler" }
-# move-coverage ={ path = "../aptos-core/third_party/move/tools/move-coverage" }
-# move-core-types = { path = "../aptos-core/third_party/move/move-core/types" }
-# move-docgen = { path = "../aptos-core/third_party/move/move-prover/move-docgen" }
-# move-model = { path = "../aptos-core/third_party/move/move-model" }
-# move-package = { path = "../aptos-core/third_party/move/tools/move-package" }
-# move-prover = { path = "../aptos-core/third_party/move/move-prover" }
-# move-prover-boogie-backend = { path = "../aptos-core/third_party/move/move-prover/boogie-backend" }
-# move-prover-bytecode-pipeline = { path = "../aptos-core/third_party/move/move-prover/bytecode-pipeline" }
-# move-resource-viewer = { path = "../aptos-core/third_party/move/tools/move-resource-viewer" }
-# move-stackless-bytecode = { path = "../aptos-core/third_party/move/move-model/bytecode" }
-# move-stdlib = { path = "../aptos-core/third_party/move/move-stdlib" }
-# move-symbol-pool = { path = "../aptos-core/third_party/move/move-symbol-pool" }
-# move-unit-test = { path = "../aptos-core/third_party/move/tools/move-unit-test" }
-# move-vm-runtime = { path = "../aptos-core/third_party/move/move-vm/runtime" }
-# move-vm-test-utils = { path = "../aptos-core/third_party/move/move-vm/test-utils" }
-# move-vm-types = { path = "../aptos-core/third_party/move/move-vm/types" }
+# move-binary-format = { path = "../move/move-binary-format" }
+# move-bytecode-verifier = { path = "../move/move-bytecode-verifier" }
+# move-bytecode-utils = { path = "../move/tools/move-bytecode-utils" }
+# move-cli = { path = "../move/tools/move-cli" }
+# move-command-line-common = { path = "../move/move-command-line-common" }
+# move-compiler = { path = "../move/move-compiler" }
+# move-coverage ={ path = "../move/tools/move-coverage" }
+# move-core-types = { path = "../move/move-core/types" }
+# move-docgen = { path = "../move/move-prover/move-docgen" }
+# move-model = { path = "../move/move-model" }
+# move-package = { path = "../move/tools/move-package" }
+# move-prover = { path = "../move/move-prover" }
+# move-prover-boogie-backend = { path = "../move/move-prover/boogie-backend" }
+# move-prover-bytecode-pipeline = { path = "../move/move-prover/bytecode-pipeline" }
+# move-resource-viewer = { path = "../move/tools/move-resource-viewer" }
+# move-stackless-bytecode = { path = "../move/move-model/bytecode" }
+# move-stdlib = { path = "../move/move-stdlib" }
+# move-symbol-pool = { path = "../move/move-symbol-pool" }
+# move-unit-test = { path = "../move/tools/move-unit-test" }
+# move-vm-runtime = { path = "../move/move-vm/runtime" }
+# move-vm-test-utils = { path = "../move/move-vm/test-utils" }
+# move-vm-types = { path = "../move/move-vm/types" }

Makefile

@@ -53,7 +53,7 @@ test-safety:
 	# Use package list mode to include all subdirectores. The -count=1 turns off caching.
 	GODEBUG=cgocheck=2 go test -race -v -count=1 -parallel=1 ./...
 
-test-rust: test-compiler test-lib test-e2e test-movevm test-json
+test-rust: test-compiler test-lib test-e2e test-movevm test-json test-storage
 
 test-compiler:
 	cargo test -p initia-move-compiler
@@ -67,6 +67,9 @@ test-json:
 test-lib:
 	cargo test -p initia-move-vm
 
+test-storage:
+	cargo test -p initia-move-storage
+
 test-e2e: 
 	cargo test -p e2e-move-tests --features testing
 

builders/Dockerfile.alpine

@@ -16,7 +16,7 @@ RUN set -eux \
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init" \
   && chmod +x rustup-init \
-  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.77.1 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.80.1 \
   && rm rustup-init \
   && chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 

builders/Dockerfile.centos7

@@ -27,7 +27,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \
   && chmod +x rustup-init \
-  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.77.1 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.80.1 \
   && rm rustup-init \
   && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
   && rustup --version \

builders/Dockerfile.cross

@@ -1,4 +1,4 @@
-FROM rust:1.77.1-bullseye
+FROM rust:1.80.1-bullseye
 
 # Install build dependencies
 RUN apt-get update \

crates/compiler/src/unit_test_factory.rs

@@ -27,11 +27,12 @@ impl InitiaUnitTestFactory {
         let table_change_set = table_context
             .into_change_set()
             .map_err(|e| e.finish(Location::Undefined))?;
-        let write_set = WriteSet::new(changes.clone(), table_change_set).map_err(|e| {
-            PartialVMError::new(StatusCode::FAILED_TO_SERIALIZE_WRITE_SET_CHANGES)
-                .with_message(e.to_string())
-                .finish(Location::Undefined)
-        })?;
+        let write_set =
+            WriteSet::new_with_change_set(changes.clone(), table_change_set).map_err(|e| {
+                PartialVMError::new(StatusCode::FAILED_TO_SERIALIZE_WRITE_SET_CHANGES)
+                    .with_message(e.to_string())
+                    .finish(Location::Undefined)
+            })?;
 
         gas_meter.charge_write_set_gas(&write_set)?;
 

crates/e2e-move-tests/src/harness.rs

@@ -13,7 +13,7 @@ use move_package::BuildConfig;
 use crate::test_utils::mock_chain::{MockAPI, MockChain, MockState, MockTableState};
 use crate::test_utils::parser::MemberId;
 use initia_move_gas::Gas;
-use initia_move_storage::{state_view::StateView, state_view_impl::StateViewImpl};
+use initia_move_storage::state_view::StateView;
 use initia_move_types::access_path::AccessPath;
 use initia_move_types::message::{Message, MessageOutput};
 use initia_move_types::module::ModuleBundle;
@@ -69,7 +69,6 @@ impl MoveHarness {
 
     pub fn initialize(&mut self) {
         let state = self.chain.create_state();
-        let resolver = StateViewImpl::new(&state);
         let mut table_resolver = MockTableState::new(&state);
 
         let env = Env::new(
@@ -85,7 +84,7 @@ impl MoveHarness {
             .initialize(
                 &self.api,
                 &env,
-                &resolver,
+                &state,
                 &mut table_resolver,
                 self.load_precompiled_stdlib()
                     .expect("Failed to load precompiles"),
@@ -109,9 +108,10 @@ impl MoveHarness {
         &mut self,
         acc: &AccountAddress,
         path: &str,
+        upgrade_policy: u8,
     ) -> Result<MessageOutput, VMStatus> {
-        let (module_ids, code) = self.compile_package(path);
-        let msg = self.create_publish_message(*acc, module_ids, code);
+        let code = self.compile_package(path);
+        let msg = self.create_publish_message(*acc, code, upgrade_policy);
         self.run_message(msg)
     }
 
@@ -158,7 +158,6 @@ impl MoveHarness {
         view_fn: ViewFunction,
         state: &MockState,
     ) -> Result<ViewOutput, VMStatus> {
-        let resolver = StateViewImpl::new(state);
         let mut table_resolver = MockTableState::new(state);
 
         let gas_limit = Gas::new(100_000_000u64);
@@ -176,7 +175,7 @@ impl MoveHarness {
             &mut gas_meter,
             &self.api,
             &env,
-            &resolver,
+            state,
             &mut table_resolver,
             &view_fn,
         )
@@ -188,7 +187,7 @@ impl MoveHarness {
         vals
     }
 
-    pub fn compile_package(&mut self, path: &str) -> (Vec<String>, Vec<Vec<u8>>) {
+    pub fn compile_package(&mut self, path: &str) -> Vec<Vec<u8>> {
         let package_path = path_in_crate(path);
         let package = BuiltPackage::build(
             package_path.clone(),
@@ -202,29 +201,22 @@ impl MoveHarness {
         )
         .expect("compile failed");
 
-        (
-            package
-                .modules()
-                .map(|v| v.self_id().short_str_lossless())
-                .collect(),
-            package.extract_code(),
-        )
+        package.extract_code()
     }
 
     pub fn create_publish_message(
         &mut self,
         sender: AccountAddress,
-        module_ids: Vec<String>,
         modules: Vec<Vec<u8>>,
+        upgrade_policy: u8,
     ) -> Message {
         let ef = MoveHarness::create_entry_function_with_json(
-            str::parse("0x1::code::publish").unwrap(),
+            str::parse("0x1::code::publish_v2").unwrap(),
             vec![],
             vec![
-                serde_json::to_string(&module_ids).unwrap(),
                 serde_json::to_string(&modules.iter().map(hex::encode).collect::<Vec<String>>())
                     .unwrap(),
-                serde_json::to_string(&(1_u8)).unwrap(), // compatible upgrade policy
+                serde_json::to_string(&upgrade_policy).unwrap(), // compatible upgrade policy
             ],
         );
         Message::execute(vec![sender], ef)
@@ -321,8 +313,6 @@ impl MoveHarness {
         );
 
         let state = self.chain.create_state();
-
-        let resolver = StateViewImpl::new(&state);
         let mut table_resolver = MockTableState::new(&state);
 
         let gas_limit: initia_move_gas::GasQuantity<initia_move_gas::GasUnit> =
@@ -332,7 +322,7 @@ impl MoveHarness {
             &mut gas_meter,
             &self.api,
             &env,
-            &resolver,
+            &state,
             &mut table_resolver,
             message,
         )
@@ -351,7 +341,6 @@ impl MoveHarness {
             Self::generate_random_hash().try_into().unwrap(),
         );
 
-        let resolver = StateViewImpl::new(state);
         let mut table_resolver = MockTableState::new(state);
 
         let gas_limit = Gas::new(100_000_000u64);
@@ -360,7 +349,7 @@ impl MoveHarness {
             &mut gas_meter,
             &self.api,
             &env,
-            &resolver,
+            state,
             &mut table_resolver,
             message,
         )