feat: aptos node v1.14

Signed-off-by: Thomas Chataigner <[email protected]>
argumentcomputer · Jun 12, 2024 · 84aff5c · 84aff5c
1 parent 3a8632d
commit 84aff5c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/aptos/Cargo.toml b/aptos/Cargo.toml
@@ -10,17 +10,17 @@ members = [
 
 [workspace.dependencies]
 anyhow = "1.0.79"
-aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-executor = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-executor-test-helpers = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-executor-types = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-sdk = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-storage-interface = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-temppath = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-types = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-vm = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-aptos-vm-genesis = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.12.0" }
-# From https://github.com/aptos-labs/aptos-core/blob/aptos-node-v1.12.0/Cargo.toml#L482
+aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-executor = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-executor-test-helpers = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-executor-types = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-sdk = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-storage-interface = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-temppath = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-types = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-vm = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+aptos-vm-genesis = { git = "https://github.com/aptos-labs/aptos-core/", tag = "aptos-node-v1.14.0" }
+# From https://github.com/aptos-labs/aptos-core/blob/aptos-node-v1.14.0/Cargo.toml#L485
 bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
 bls12_381 = { git = "https://github.com/lurk-lab/bls12_381.git", branch = "zkvm" }
 bytes = "1.5.0"

diff --git a/aptos/aptos-programs/artifacts/inclusion-program b/aptos/aptos-programs/artifacts/inclusion-program
diff --git a/aptos/core/src/aptos_test_utils/wrapper.rs b/aptos/core/src/aptos_test_utils/wrapper.rs
@@ -12,6 +12,7 @@ use aptos_executor::block_executor::BlockExecutor;
 use aptos_executor_test_helpers::gen_block_id;
 use aptos_executor_test_helpers::integration_test_impl::create_db_and_executor;
 use aptos_executor_types::BlockExecutorTrait;
+use aptos_sdk::move_types::move_resource::MoveStructType;
 use aptos_sdk::transaction_builder::aptos_stdlib::version_set_version;
 use aptos_sdk::transaction_builder::{aptos_stdlib, TransactionFactory};
 use aptos_sdk::types::{AccountKey, LocalAccount};
@@ -35,11 +36,10 @@ use aptos_types::transaction::{Transaction, TransactionInfo, WriteSetPayload};
 use aptos_types::trusted_state::{TrustedState, TrustedStateChange};
 use aptos_types::validator_signer::ValidatorSigner;
 use aptos_types::validator_verifier::{ValidatorConsensusInfo, ValidatorVerifier};
+use aptos_types::PeerId;
 use aptos_vm::AptosVM;
 use aptos_vm_genesis::TestValidator;
 use getset::Getters;
-use move_core_types::account_address::AccountAddress;
-use move_core_types::move_resource::MoveStructType;
 use rand::prelude::SliceRandom;
 use rand::SeedableRng;
 use serde::{Deserialize, Serialize};
@@ -267,7 +267,7 @@ impl AptosWrapper {
                         .map_err(|e| AptosError::Internal { source: e.into() })
                         .map(|s| (signer.author(), s))
                 })
-                .collect::<Result<BTreeMap<AccountAddress, Signature>, AptosError>>()?,
+                .collect::<Result<BTreeMap<PeerId, Signature>, AptosError>>()?,
         );
 
         let validator_consensus_info = self

diff --git a/aptos/core/src/merkle/sparse_proof.rs b/aptos/core/src/merkle/sparse_proof.rs
@@ -108,6 +108,7 @@ impl SparseMerkleProof {
         let reconstructed_root = self
             .siblings
             .iter()
+            .rev()
             .zip(
                 element_key
                     .iter_bits()
@@ -265,6 +266,7 @@ mod test {
         let value_hash = leaf_node.value_hash();
         let expected_root_hash = siblings
             .iter()
+            .rev()
             .zip(key.iter_bits().rev().skip(HASH_LENGTH * 8 - siblings.len()))
             .fold(leaf_node.hash(), |acc_hash, (sibling_hash, bit)| {
                 if bit {