use latest move revision

Closes: aptos-labs#532

api/Cargo.toml

@@ -35,8 +35,8 @@ aptos-vm = { path = "../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../crates/aptos-workspace-hack" }
 aptos-api-types = { path = "./types", package = "aptos-api-types" }
 storage-interface = { path = "../storage/storage-interface" }
-move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
-move-resource-viewer = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
 
 [dev-dependencies]
 goldenfile = "1.1.0"

api/goldens/aptos_api__tests__transactions_test__test_get_transactions_output_user_transaction_with_script_function_payload.json

@@ -3,12 +3,12 @@
     "type": "block_metadata_transaction",
     "version": "1",
     "hash": "0xa8fc186c28fc0f95b8233651438093e8e215a51dcd16475f5e68c0a421f6305c",
-    "state_root_hash": "0x8db36edb4b35e7d02e6ffd1554550934267f808fb77d50e9cb710c35f4f24999",
+    "state_root_hash": "0x22b0b5b25b46a506b56fdc78166b208520c9d3c9bfe87e921cc6e30b19899b09",
     "event_root_hash": "0xd62c85b93234824cf825e9c028c3bcc59b06926039721bd7edd76b56ae9fcecf",
     "gas_used": "0",
     "success": true,
     "vm_status": "Executed successfully",
-    "accumulator_root_hash": "0x7f6cb9873bd1ac076122b8b53002ebe269c25b0bcb9ed70edd9f6671a78c44e3",
+    "accumulator_root_hash": "0x6966b7d2555fb31c76e6e86cda67fd3351d1c876a3bd5581c66645f45666892e",
     "id": "0xf44b581f23222c10916b17a369b4da039d075952b58036f2a7b561446592403c",
     "round": "1",
     "previous_block_votes": [],
@@ -19,12 +19,12 @@
     "type": "user_transaction",
     "version": "2",
     "hash": "0x90a2b7c52f781e7e5f5a928b6e3273c9aa3adcb8529183f93b052d4f21c005b2",
-    "state_root_hash": "0xdaad8ae1364ab92be7373ffd15380d349a30e81ecff8e1ffe1e3cee7484ed2ca",
+    "state_root_hash": "0xf996f6d628353d1f0d0f86fc5a7435ed7de035872f9f75449786bb97bb017895",
     "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
     "gas_used": "98",
     "success": true,
     "vm_status": "Executed successfully",
-    "accumulator_root_hash": "0x46d7a2930374b8f3b618cb25fbabf473cd673d93ec4f5eb55fbb453caca93ffd",
+    "accumulator_root_hash": "0xdde657955be861056b40695d1cd50aefd82800532bd7e50ed1624941a40fc470",
     "sender": "0xa550c18",
     "sequence_number": "0",
     "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_invalid_module_payload_bytecode.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0xcb799b84973fe9a6646599d7f35a797145cf6147fdbd374b680d86e95bc6be52",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0x26ab5c04eae0d118bdd9a2855fd867c4ba12fea4aa0f1480b4670a51888f4ca4",
+  "accumulator_root_hash": "0x729b55d4b2a76287d803bce4015409081d47797707f2b4df185a009b7df821c0",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_invalid_script_function_address.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0xba9f68d656259750fdd87d6448bfff411daa120eaa47c8209020d5697598e04d",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0x85fc5e5f420d2713f7c76f14c7cb50cd55791449632c86200ad92b4a947ca4de",
+  "accumulator_root_hash": "0x9b12f7d5c631c6e27d7f139f41ec9cdcc1cf4bdf615b8c30ee221ea2769d8d28",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_invalid_script_function_arguments.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0x76c29783900a695057e9a7fa2973a0f555432d36e9aab9dec3cd31ec166e68b3",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0x7e07e4563f59a110f4f6f97b91c9984a50f4267a5b09e371f2dabdd9bb36ec61",
+  "accumulator_root_hash": "0xb18006b7584199db564fef9cae135479cd6248b4b73e2cc1263a098a6b5f48f6",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_invalid_script_function_module_name.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0x8fa9802b9b8dd84ad1494ab0044adb9c9f280732ab6fef67b248cee44cc4c9ed",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0x03f748d121d8c1c3bec45058dca70282cf1cd34cb66a77a431b302fe340fd70c",
+  "accumulator_root_hash": "0xa9b017d8ecec4ce9343591d8aa6df15e8b90dc754fa1842a925b2acfdc169e69",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_invalid_script_function_name.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0xfb4cb05816a067c3dc02df8b628a2924c030937599565fb317de48736cd98b4d",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0xb46de4961ff46248e9a23865bf81f7a9d86cb81f22e55725dd5622d5cc0c1444",
+  "accumulator_root_hash": "0x54769e5d17ae71924c1c694401494b0863a9616665dc1ed7ae4e3ee6ca457d37",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_invalid_script_payload_bytecode.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0x2bf7670f9cea191af66917f1a2d3592fe82c9d004b66ab62ac8162e6d45af145",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0xb990ba156edc06edbaf55276039b9d7a7bbe7e4ca4fc5ed606952071a41bd027",
+  "accumulator_root_hash": "0xb9524b28e7b278a4696244bbe13e87a3608edc8667846ec2e3fadec2139020b3",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_missing_script_function_arguments.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "2",
   "hash": "0xf0f0fcfd90c806e9985fceabcc836b172007cc3490641a8830c1ff8684a50485",
-  "state_root_hash": "0x35704a7851c5e2da0ef26eae6d11826060066f9c09365ba1cd3a037ee9c5fb7b",
+  "state_root_hash": "0x6690dfab047db753fa6a78cf5e64a4758c3d00983f9ca3223de59013635fd7be",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "1",
   "success": false,
   "vm_status": "Move bytecode deserialization / verification failed, including script function not found or invalid arguments",
-  "accumulator_root_hash": "0xd29dc3f964eec63eb7433e5b24ab1e72ea5ae2398920216f187760145f72476c",
+  "accumulator_root_hash": "0x6ebff98cdac96d88825da892a0a5ce67dad5b8bf4abeb2b0c3d7ae63bfce8ee3",
   "sender": "0xa550c18",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/goldens/aptos_api__tests__transactions_test__test_get_txn_execute_failed_by_script_function_validation.json

@@ -2,12 +2,12 @@
   "type": "user_transaction",
   "version": "4",
   "hash": "0x6bb8523ed342ba8f8142042b77e08c1d4fad3ba6673f109f37cd0865adafbd1c",
-  "state_root_hash": "0x5a05cf070b91b628fd7380b485c2f6e278de199ef960c61165d99952b5621f53",
+  "state_root_hash": "0xd030b75be6d3773a32692517373c7138f1679d24ce8a2ec5144cbf2225757781",
   "event_root_hash": "0x414343554d554c41544f525f504c414345484f4c4445525f4841534800000000",
   "gas_used": "26",
   "success": false,
   "vm_status": "Move abort by LIMIT_EXCEEDED - EINSUFFICIENT_BALANCE\n A limit on an amount, e.g. a currency, is exceeded. Example: withdrawal of money after account limits window\n is exhausted.\n Error codes",
-  "accumulator_root_hash": "0x1f0690f3a627abaf4f610896573fb65706464e6364bdc8322f59da4fae6d92c2",
+  "accumulator_root_hash": "0x9faec405915c176c2bda6a1edc6814eb919856dc935dc54c3abfd5dfb757ecd4",
   "sender": "0xe60912ecb0a8c365d163d258f3b9f1b62f8f9148c207643864d7ed4a2b23159",
   "sequence_number": "0",
   "max_gas_amount": "2000",

api/src/tests/transactions_test.rs

@@ -1041,9 +1041,7 @@ async fn test_transaction_vm_status(
         .expect_status_code(202)
         .post_bcs_txn("/transactions", body)
         .await;
-
     context.commit_mempool_txns(1).await;
-
     let resp = context
         .get(format!("/transactions/{}", txn.committed_hash().to_hex_literal()).as_str())
         .await;

api/types/Cargo.toml

@@ -23,9 +23,9 @@ aptos-transaction-builder = { path = "../../sdk/transaction-builder" }
 aptos-types = { path = "../../types" }
 aptos-vm = { path = "../../aptos-move/aptos-vm" }
 aptos-workspace-hack = { version = "0.1", path = "../../crates/aptos-workspace-hack" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
-move-resource-viewer = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
 
 [dev-dependencies]
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }

api/types/src/address.rs

@@ -113,7 +113,7 @@ mod tests {
 
         let account_address: AccountAddress = address.into();
         assert_eq!(
-            account_address.to_string(),
+            account_address.short_str_lossless().as_str(),
             AccountAddress::ONE.to_hex().as_str()
         );
 
@@ -127,7 +127,7 @@ mod tests {
 
         let account_address: AccountAddress = (&address).into();
         assert_eq!(
-            account_address.to_string(),
+            account_address.short_str_lossless().as_str(),
             AccountAddress::ONE.to_hex().as_str()
         );
 

aptos-move/af-cli/Cargo.toml

@@ -17,9 +17,9 @@ clap = "3.1.8"
 aptos-vm = { path = "../aptos-vm" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 cached-framework-packages =  { path = "../framework/cached-packages" }
-move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
-move-vm-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-cli = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-vm-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-cli = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
 
 [dev-dependencies]
 datatest-stable = "0.1.1"

aptos-move/aptos-resource-viewer/Cargo.toml

@@ -11,9 +11,9 @@ edition = "2018"
 
 [dependencies]
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
-move-resource-viewer = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-resource-viewer = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
 aptos-types = { path = "../../types"  }
-move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
 
 anyhow = "1.0.52"

aptos-move/aptos-transaction-benchmarks/Cargo.toml

@@ -19,8 +19,8 @@ language-e2e-tests = { path = "../e2e-tests" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 aptos-crypto = { path = "../../crates/aptos-crypto" }
 
-read-write-set = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-read-write-set-dynamic = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+read-write-set = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+read-write-set-dynamic = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
 aptos-vm = { path = "../aptos-vm" }
 
 [[bench]]

aptos-move/aptos-transactional-test-harness/Cargo.toml

@@ -19,11 +19,13 @@ bcs = "0.1.2"
 hex = "0.4.3"
 
 # Move dependencies
-move-transactional-test-runner = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-compiler = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
-move-core-types = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa", features=["address32"] }
-move-command-line-common = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-transactional-test-runner = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-compiler = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65", features=["address32"] }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+move-vm-runtime = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }
+
 
 # Diem-Move dependencies
 aptos-keygen = { path = "../aptos-keygen" }

aptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs

@@ -47,12 +47,14 @@ use move_core_types::{
     language_storage::{ModuleId, ResourceKey, TypeTag},
     move_resource::MoveStructType,
     transaction_argument::{convert_txn_args, TransactionArgument},
+    value::MoveTypeLayout,
 };
 use move_transactional_test_runner::{
     framework::{run_test_impl, CompiledState, MoveTestAdapter},
     tasks::{InitCommand, RawAddress, SyntaxChoice, TaskInput},
     vm_test_harness::view_resource_in_move_storage,
 };
+use move_vm_runtime::session::SerializedReturnValues;
 use once_cell::sync::Lazy;
 use std::{
     collections::{BTreeMap, HashMap},
@@ -989,7 +991,7 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
         txn_args: Vec<TransactionArgument>,
         gas_budget: Option<u64>,
         extra_args: Self::ExtraRunArgs,
-    ) -> Result<Option<String>> {
+    ) -> Result<(Option<String>, SerializedReturnValues)> {
         if !extra_args.admin_script {
             panic!(
                 "Transactions scripts are not currently allowed. \
@@ -1060,7 +1062,13 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
             None
         };
 
-        Ok(output)
+        //TODO: replace this dummy value with actual txn return value
+        let a = SerializedReturnValues {
+            mutable_reference_outputs: vec![(0, vec![0], MoveTypeLayout::U8)],
+            return_values: vec![(vec![0], MoveTypeLayout::U8)],
+        };
+
+        Ok((output, a))
     }
 
     fn call_function(
@@ -1072,7 +1080,7 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
         txn_args: Vec<TransactionArgument>,
         gas_budget: Option<u64>,
         extra_args: Self::ExtraRunArgs,
-    ) -> Result<Option<String>> {
+    ) -> Result<(Option<String>, SerializedReturnValues)> {
         if extra_args.admin_script {
             panic!("Admin script functions are not supported.")
         }
@@ -1141,7 +1149,12 @@ impl<'a> MoveTestAdapter<'a> for AptosTestAdapter<'a> {
             None
         };
 
-        Ok(output)
+        //TODO: replace this dummy value with actual txn return value
+        let a = SerializedReturnValues {
+            mutable_reference_outputs: vec![(0, vec![0], MoveTypeLayout::U8)],
+            return_values: vec![(vec![0], MoveTypeLayout::U8)],
+        };
+        Ok((output, a))
     }
 
     fn view_data(

aptos-move/aptos-validator-interface/Cargo.toml

@@ -17,4 +17,4 @@ aptosdb = { path = "../../storage/aptosdb" }
 aptos-workspace-hack = { path = "../../crates/aptos-workspace-hack" }
 storage-interface = { path = "../../storage/storage-interface" }
 aptos-state-view = { path = "../../storage/state-view" }
-move-binary-format = { git = "https://github.com/diem/move", rev = "3fe033b112eae7df2d15ab3467624165ae510caa" }
+move-binary-format = { git = "https://github.com/move-language/move", rev = "43f1e151dea91ca8e8c7644557e55b8f456fbb65" }