feat(aptos): bump to aptos node v1.27.2 (#176)

* bump aptos core

* fmt clippy

* add charge_heap_memory into gas meter

* fmt

* use serde_json preserve_order and format and clippy

* remove preserve order

* fix test

---------

Co-authored-by: beer-1 <[email protected]>

Author: sh-cha

Cargo.toml

@@ -92,7 +92,10 @@ serde = { version = "1.0.188", default-features = false, features = [
     "rc",
 ] }
 serde_bytes = "0.11.9"
-serde_json = { version = "1.0.94" }
+serde_json = { version = "1.0.81", features = [
+    "preserve_order",
+    "arbitrary_precision",
+] } # Note: arbitrary_precision is required to parse u256 in JSON
 serde-generate = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
 serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
 sha2 = "0.10.8"
@@ -116,28 +119,28 @@ tiny-keccak = { version = "2.0.2", features = ["keccak", "sha3"] }
 # Note: the BEGIN and END comments below are required for external tooling. Do not remove.
 # BEGIN MOVE DEPENDENCIES
 
-move-binary-format = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-bytecode-verifier = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-cli = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-command-line-common = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-compiler = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-coverage = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-core-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-docgen = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-model = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-package = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-prover = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-prover-boogie-backend = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-prover-bytecode-pipeline = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-stackless-bytecode = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-stdlib = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-symbol-pool = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-unit-test = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
-move-vm-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "751c9a34969e54dd18452d41f3c996fc2e971eb7" }
+move-binary-format = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-bytecode-verifier = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-cli = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-command-line-common = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-compiler = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-coverage = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-core-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-docgen = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-model = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-package = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-prover = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-prover-boogie-backend = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-prover-bytecode-pipeline = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-stackless-bytecode = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-stdlib = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-symbol-pool = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-unit-test = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
+move-vm-types = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "4ace64edcc41878fe348c07238cfe497a5cb6714" }
 
 # END MOVE DEPENDENCIES
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all build build-rust build-go test precompile
+.PHONY: all build build-rust build-go test precompile contracts-gen bcs-go-gen
 
 # Builds the Rust library libmovevm
 BUILDERS_PREFIX := initia/go-ext-builder:0001
@@ -80,9 +80,11 @@ build: precompile build-rust build-go
 
 build-rust: build-rust-release
 
+contracts-gen: precompile
 precompile:
 	cargo run -p precompile
 
+bcs-go-gen: prebuild-go
 prebuild-go:
 	cargo run -p generate-bcs-go
 

crates/compiler/src/built_package.rs

@@ -65,7 +65,7 @@ impl BuiltPackage {
         }
 
         let (mut package, model_opt) =
-            new_config.compile_package_no_exit(&package_path, &mut stderr())?;
+            new_config.compile_package_no_exit(&package_path, vec![], &mut stderr())?;
 
         // Run extended checks as well as derive runtime metadata
         let model = &model_opt.expect("move model");

crates/compiler/src/unit_test_factory.rs

@@ -25,7 +25,7 @@ impl InitiaUnitTestFactory {
         table_context: NativeTableContext,
     ) -> VMResult<()> {
         let table_change_set = table_context
-            .into_change_set()
+            .into_change_set(None)
             .map_err(|e| e.finish(Location::Undefined))?;
         let write_set =
             WriteSet::new_with_change_set(changes.clone(), table_change_set).map_err(|e| {

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

@@ -115,7 +115,7 @@ fn test_cosmos_delegate() {
         &delegator_address.into_bytes(),
     )
     .unwrap();
-    let expected_data = format!("{{\"@type\":\"/initia.mstaking.v1.MsgDelegate\",\"amount\":[{{\"amount\":\"{amount}\",\"denom\":\"{staking_denom}\"}}],\"delegator_address\":\"{delegator_cosmos_addr}\",\"validator_address\":\"{validator_address}\"}}");
+    let expected_data = format!("{{\"@type\":\"/initia.mstaking.v1.MsgDelegate\",\"delegator_address\":\"{delegator_cosmos_addr}\",\"validator_address\":\"{validator_address}\",\"amount\":[{{\"denom\":\"{staking_denom}\",\"amount\":\"{amount}\"}}]}}");
     let test_delegate = (
         delegator_address,
         "0x1::cosmos::delegate",
@@ -169,7 +169,7 @@ fn test_cosmos_fund_community_pool() {
     let depositor_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender_address.into_bytes())
             .unwrap();
-    let expected_data = format!("{{\"@type\":\"/cosmos.distribution.v1beta1.MsgFundCommunityPool\",\"amount\":[{{\"amount\":\"{amount}\",\"denom\":\"{denom}\"}}],\"depositor\":\"{depositor_cosmos_addr}\"}}");
+    let expected_data = format!("{{\"@type\":\"/cosmos.distribution.v1beta1.MsgFundCommunityPool\",\"depositor\":\"{depositor_cosmos_addr}\",\"amount\":[{{\"denom\":\"{denom}\",\"amount\":\"{amount}\"}}]}}");
 
     let test_fund_community_pool = (
         sender_address,
@@ -226,7 +226,7 @@ fn test_cosmos_transfer() {
     let denom = str::from_utf8(STAKING_SYMBOL).unwrap();
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
-    let expected_data = format!("{{\"@type\":\"/ibc.applications.transfer.v1.MsgTransfer\",\"memo\":\"{memo}\",\"receiver\":\"{receiver}\",\"sender\":\"{sender_cosmos_addr}\",\"source_channel\":\"{source_channel}\",\"source_port\":\"{source_port}\",\"timeout_height\":{{\"revision_height\":\"{revision_height}\",\"revision_number\":\"{revision_number}\"}},\"timeout_timestamp\":\"{timeout_timestamp}\",\"token\":{{\"amount\":\"{amount}\",\"denom\":\"{denom}\"}}}}");
+    let expected_data = format!("{{\"@type\":\"/ibc.applications.transfer.v1.MsgTransfer\",\"source_port\":\"{source_port}\",\"source_channel\":\"{source_channel}\",\"sender\":\"{sender_cosmos_addr}\",\"receiver\":\"{receiver}\",\"token\":{{\"denom\":\"{denom}\",\"amount\":\"{amount}\"}},\"timeout_height\":{{\"revision_number\":\"{revision_number}\",\"revision_height\":\"{revision_height}\"}},\"timeout_timestamp\":\"{timeout_timestamp}\",\"memo\":\"{memo}\"}}");
 
     let test_transfer = (
         sender,
@@ -298,7 +298,7 @@ fn test_cosmos_nft_transfer() {
     let class_id = str::from_utf8(COLLECTION_NAME).unwrap();
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
-    let expected_data = format!("{{\"@type\":\"/ibc.applications.nft_transfer.v1.MsgTransfer\",\"class_id\":\"{class_id}\",\"memo\":\"{memo}\",\"receiver\":\"{receiver}\",\"sender\":\"{sender_cosmos_addr}\",\"source_channel\":\"{source_channel}\",\"source_port\":\"{source_port}\",\"timeout_height\":{{\"revision_height\":\"{revision_height}\",\"revision_number\":\"{revision_number}\"}},\"timeout_timestamp\":\"{timeout_timestamp}\",\"token_ids\":[\"id1\",\"id2\"]}}");
+    let expected_data = format!("{{\"@type\":\"/ibc.applications.nft_transfer.v1.MsgTransfer\",\"sender\":\"{sender_cosmos_addr}\",\"receiver\":\"{receiver}\",\"class_id\":\"{class_id}\",\"token_ids\":[\"id1\",\"id2\"],\"source_port\":\"{source_port}\",\"source_channel\":\"{source_channel}\",\"timeout_height\":{{\"revision_number\":\"{revision_number}\",\"revision_height\":\"{revision_height}\"}},\"timeout_timestamp\":\"{timeout_timestamp}\",\"memo\":\"{memo}\"}}");
 
     let test_nft_transfer = (
         sender,
@@ -398,7 +398,7 @@ fn test_cosmos_pay_fee() {
     let timeout_fee_denom = str::from_utf8(FEE_B_SYMBOL).unwrap();
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
-    let expected_data = format!("{{\"@type\":\"/ibc.applications.fee.v1.MsgPayPacketFee\",\"fee\":{{\"ack_fee\":[{{\"amount\":\"{ack_fee_amount}\",\"denom\":\"{ack_fee_denom}\"}}],\"recv_fee\":[{{\"amount\":\"{recv_fee_amount}\",\"denom\":\"{recv_fee_denom}\"}}],\"timeout_fee\":[{{\"amount\":\"{timeout_fee_amount}\",\"denom\":\"{timeout_fee_denom}\"}}]}},\"relayers\":[],\"signer\":\"{sender_cosmos_addr}\",\"source_channel_id\":\"{source_channel}\",\"source_port_id\":\"{source_port}\"}}");
+    let expected_data = format!("{{\"@type\":\"/ibc.applications.fee.v1.MsgPayPacketFee\",\"signer\":\"{sender_cosmos_addr}\",\"source_port_id\":\"{source_port}\",\"source_channel_id\":\"{source_channel}\",\"fee\":{{\"recv_fee\":[{{\"denom\":\"{recv_fee_denom}\",\"amount\":\"{recv_fee_amount}\"}}],\"ack_fee\":[{{\"denom\":\"{ack_fee_denom}\",\"amount\":\"{ack_fee_amount}\"}}],\"timeout_fee\":[{{\"denom\":\"{timeout_fee_denom}\",\"amount\":\"{timeout_fee_amount}\"}}]}},\"relayers\":[]}}");
 
     let test_pay_fee = (
         sender,
@@ -449,7 +449,7 @@ fn test_cosmos_move_execute() {
     let module_addr_hex = module_address.to_hex_literal();
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
-    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgExecute\",\"args\":[\"{arg1_base64}\",\"{arg2_base64}\"],\"function_name\":\"{function_name}\",\"module_address\":\"{module_addr_hex}\",\"module_name\":\"{module_name}\",\"sender\":\"{sender_cosmos_addr}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"]}}");
+    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgExecute\",\"sender\":\"{sender_cosmos_addr}\",\"module_address\":\"{module_addr_hex}\",\"module_name\":\"{module_name}\",\"function_name\":\"{function_name}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"],\"args\":[\"{arg1_base64}\",\"{arg2_base64}\"]}}");
 
     let test_move_execute = (
         sender,
@@ -494,7 +494,7 @@ fn test_cosmos_move_execute_with_json() {
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
     let module_addr_hex = module_address.to_hex_literal();
-    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgExecuteJSON\",\"args\":[\"\\\"hello\\\"\",\"\\\"world\\\"\"],\"function_name\":\"{function_name}\",\"module_address\":\"{module_addr_hex}\",\"module_name\":\"{module_name}\",\"sender\":\"{sender_cosmos_addr}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"]}}");
+    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgExecuteJSON\",\"sender\":\"{sender_cosmos_addr}\",\"module_address\":\"{module_addr_hex}\",\"module_name\":\"{module_name}\",\"function_name\":\"{function_name}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"],\"args\":[\"\\\"hello\\\"\",\"\\\"world\\\"\"]}}");
 
     let test_move_execute = (
         sender,
@@ -540,7 +540,7 @@ fn test_cosmos_move_script() {
     let arg2_base64 = base64.encode(arg2.clone());
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
-    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgScript\",\"args\":[\"{arg1_base64}\",\"{arg2_base64}\"],\"code_bytes\":\"{code_bytes_base64}\",\"sender\":\"{sender_cosmos_addr}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"]}}");
+    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgScript\",\"sender\":\"{sender_cosmos_addr}\",\"code_bytes\":\"{code_bytes_base64}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"],\"args\":[\"{arg1_base64}\",\"{arg2_base64}\"]}}");
 
     let test_move_script = (
         sender,
@@ -582,7 +582,7 @@ fn test_cosmos_move_script_with_json() {
     let code_bytes_base64 = base64.encode(code_bytes.clone());
     let sender_cosmos_addr =
         bech32::encode::<Bech32>(Hrp::parse_unchecked("init"), &sender.into_bytes()).unwrap();
-    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgScriptJSON\",\"args\":[\"\\\"hello\\\"\",\"\\\"world\\\"\"],\"code_bytes\":\"{code_bytes_base64}\",\"sender\":\"{sender_cosmos_addr}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"]}}");
+    let expected_data = format!("{{\"@type\":\"/initia.move.v1.MsgScriptJSON\",\"sender\":\"{sender_cosmos_addr}\",\"code_bytes\":\"{code_bytes_base64}\",\"type_args\":[\"{type_arg1}\",\"{type_arg2}\"],\"args\":[\"\\\"hello\\\"\",\"\\\"world\\\"\"]}}");
 
     let test_move_script = (
         sender,

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

@@ -183,7 +183,7 @@ fn test_simple_staking() {
         ExpectedOutput::new(
             VMStatus::Executed,
             Some(
-                format!("{{\"metadata\":\"0x{}\",\"share\":\"500000\",\"unclaimed_reward\":\"0\",\"validator\":\"validator\"}}", staking_metadata.short_str_lossless())
+                format!("{{\"metadata\":\"0x{}\",\"validator\":\"validator\",\"share\":\"500000\",\"unclaimed_reward\":\"0\"}}", staking_metadata.short_str_lossless())
                     .to_string(),
             ),
             None,

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

@@ -49,7 +49,7 @@ fn test_view_output() {
                 type_args: vec![]
             }))
             .to_string(),
-            "{\"arg\":\"hello world\",\"type_arg\":\"u256\"}".to_string()
+            "{\"type_arg\":\"u256\",\"arg\":\"hello world\"}".to_string()
         )])
         .into_inner(),
     );

crates/gas/src/meter.rs

@@ -765,6 +765,11 @@ impl GasMeter for InitiaGasMeter {
 
         Ok(())
     }
+
+    #[inline]
+    fn charge_heap_memory(&mut self, _amount: u64) -> PartialVMResult<()> {
+        Ok(())
+    }
 }
 
 impl InitiaGasMeter {