Merge branch 'main' into zi/new-type/refactoring-paranoid-mode-to-gen…

…eric-rtt-checks

.github/workflows/workflow-run-execution-performance.yaml

@@ -27,6 +27,11 @@ on:
         default: false
         type: boolean
         description: Whether to run or skip move-only e2e tests at the beginning.
+      USE_COIN_APT:
+        required: false
+        default: false
+        type: boolean
+        description: By default, FA APT is exclusively used. If set Coin APT is used instead.
       SOURCE:
         required: false
         default: CI
@@ -74,13 +79,19 @@ on:
         - CONTINUOUS
         - MAINNET
         - MAINNET_LARGE_DB
+        - EXECUTORS
         type: choice
         description: Which set of tests to run. MAINNET/MAINNET_LARGE_DB are for performance validation of mainnet nodes.
       SKIP_MOVE_E2E:
         required: false
         default: false
         type: boolean
         description: Whether to skip move-only e2e tests at the beginning.
+      USE_COIN_APT:
+        required: false
+        default: false
+        type: boolean
+        description: By default, FA APT is exclusively used. If set Coin APT is used instead.
       IGNORE_TARGET_DETERMINATION:
         required: false
         default: true
@@ -123,7 +134,7 @@ jobs:
 
       - name: Run single node execution benchmark in performance build mode
         shell: bash
-        run: TABULATE_INSTALL=lib-only pip install tabulate && FLOW="${{ inputs.FLOW }}" SOURCE="${{ inputs.SOURCE }}" RUNNER_NAME="${{ inputs.RUNNER_NAME }}" SKIP_MOVE_E2E="${{ inputs.SKIP_MOVE_E2E && '1' || '' }}" NUMBER_OF_EXECUTION_THREADS="${{ inputs.NUMBER_OF_EXECUTION_THREADS }}" testsuite/single_node_performance.py
+        run: TABULATE_INSTALL=lib-only pip install tabulate && FLOW="${{ inputs.FLOW }}" SOURCE="${{ inputs.SOURCE }}" RUNNER_NAME="${{ inputs.RUNNER_NAME }}" SKIP_MOVE_E2E="${{ inputs.SKIP_MOVE_E2E && '1' || '' }}" DISABLE_FA_APT="${{ inputs.USE_COIN_APT && '1' || '' }}" NUMBER_OF_EXECUTION_THREADS="${{ inputs.NUMBER_OF_EXECUTION_THREADS }}" testsuite/single_node_performance.py
         if: ${{ (inputs.IGNORE_TARGET_DETERMINATION || needs.test-target-determinator.outputs.run_execution_performance_test == 'true') }}
 
       - run: echo "Skipping single node execution performance! Unrelated changes detected."

Cargo.toml

@@ -239,7 +239,6 @@ members = [
     "third_party/move/move-vm/transactional-tests",
     "third_party/move/move-vm/types",
     "third_party/move/testing-infra/module-generation",
-    "third_party/move/testing-infra/test-generation",
     "third_party/move/testing-infra/transactional-test-runner",
     "third_party/move/tools/move-bytecode-utils",
     "third_party/move/tools/move-bytecode-viewer",

api/src/context.rs

@@ -22,7 +22,9 @@ use aptos_gas_schedule::{AptosGasParameters, FromOnChainGasSchedule};
 use aptos_logger::{error, info, Schema};
 use aptos_mempool::{MempoolClientRequest, MempoolClientSender, SubmissionStatus};
 use aptos_storage_interface::{
-    state_view::{DbStateView, DbStateViewAtVersion, LatestDbStateCheckpointView},
+    state_store::state_view::db_state_view::{
+        DbStateView, DbStateViewAtVersion, LatestDbStateCheckpointView,
+    },
     AptosDbError, DbReader, Order, MAX_REQUEST_LIMIT,
 };
 use aptos_types::{

api/test-context/src/test_context.rs

@@ -31,7 +31,9 @@ use aptos_sdk::{
         transaction::SignedTransaction, AccountKey, LocalAccount,
     },
 };
-use aptos_storage_interface::{state_view::DbStateView, DbReaderWriter};
+use aptos_storage_interface::{
+    state_store::state_view::db_state_view::DbStateView, DbReaderWriter,
+};
 use aptos_temppath::TempPath;
 use aptos_types::{
     account_address::{create_multisig_account_address, AccountAddress},

aptos-move/aptos-aggregator/src/resolver.rs

@@ -86,7 +86,6 @@ pub trait TAggregatorV1View {
             PartialVMError::new(StatusCode::SPECULATIVE_EXECUTION_ABORT_ERROR)
                 .with_message("Cannot convert delta for deleted aggregator".to_string())
         })?;
-
         delta_op
             .apply_to(base)
             .map_err(|e| match &e {

aptos-move/aptos-debugger/src/aptos_debugger.rs

@@ -28,7 +28,7 @@ use aptos_validator_interface::{
     AptosValidatorInterface, DBDebuggerInterface, DebuggerStateView, RestDebuggerInterface,
 };
 use aptos_vm::{
-    block_executor::{AptosTransactionOutput, BlockAptosVM},
+    block_executor::{AptosTransactionOutput, AptosVMBlockExecutorWrapper},
     data_cache::AsMoveResolver,
     AptosVM,
 };
@@ -434,7 +434,7 @@ fn execute_block_no_limit(
     state_view: &DebuggerStateView,
     concurrency_level: usize,
 ) -> Result<Vec<TransactionOutput>, VMStatus> {
-    BlockAptosVM::execute_block::<
+    AptosVMBlockExecutorWrapper::execute_block::<
         _,
         NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>,
         DefaultTxnProvider<SignatureVerifiedTransaction>,

aptos-move/aptos-e2e-comparison-testing/src/data_state_view.rs

@@ -5,7 +5,7 @@ use aptos_language_e2e_tests::data_store::FakeDataStore;
 use aptos_types::{
     state_store::{
         state_key::StateKey, state_storage_usage::StateStorageUsage, state_value::StateValue,
-        Result as StateViewResult, TStateView,
+        StateViewResult, TStateView,
     },
     transaction::Version,
 };

aptos-move/aptos-gas-schedule/src/gas_schedule/transaction.rs

@@ -212,7 +212,7 @@ crate::gas_schedule::macros::define_gas_parameters!(
         [
             max_execution_gas_gov: InternalGas,
             { RELEASE_V1_13.. => "max_execution_gas.gov" },
-            4_000_000_000,
+            4_300_000_000,
         ],
         [
             max_io_gas: InternalGas,

aptos-move/aptos-release-builder/src/simulate.rs

@@ -36,9 +36,8 @@ use aptos_types::{
     account_config::ChainIdResource,
     on_chain_config::{ApprovedExecutionHashes, Features, GasScheduleV2, OnChainConfig},
     state_store::{
-        in_memory_state_view::InMemoryStateView, state_key::StateKey,
-        state_storage_usage::StateStorageUsage, state_value::StateValue,
-        Result as StateStoreResult, StateView, TStateView,
+        state_key::StateKey, state_storage_usage::StateStorageUsage, state_value::StateValue,
+        StateView, StateViewResult as StateStoreResult, TStateView,
     },
     transaction::{ExecutionStatus, Script, TransactionArgument, TransactionStatus},
     write_set::{TransactionWrite, WriteSet},
@@ -306,10 +305,6 @@ where
     fn get_usage(&self) -> StateStoreResult<StateStorageUsage> {
         Ok(StateStorageUsage::Untracked)
     }
-
-    fn as_in_memory_state_view(&self) -> InMemoryStateView {
-        panic!("not supported")
-    }
 }
 
 /***************************************************************************************************
@@ -667,12 +662,19 @@ pub async fn simulate_multistep_proposal(
         };
         // TODO: ensure all scripts trigger reconfiguration.
 
+        println!(
+            "{}",
+            format!("Fee statement: {:#?}", vm_output.fee_statement())
+                .lines()
+                .map(|line| format!("        {}", line))
+                .collect::<Vec<_>>()
+                .join("\n")
+        );
+
         let txn_output = vm_output
             .try_materialize_into_transaction_output(&resolver)
             .context("failed to materialize transaction output")?;
 
-        println!("        Gas used: {}", txn_output.gas_used());
-
         let txn_status = txn_output.status();
         match txn_status {
             TransactionStatus::Keep(ExecutionStatus::Success) => {

aptos-move/aptos-transaction-benchmarks/src/transaction_bench_state.rs

@@ -35,7 +35,7 @@ use aptos_types::{
     vm_status::VMStatus,
 };
 use aptos_vm::{
-    block_executor::{AptosTransactionOutput, BlockAptosVM},
+    block_executor::{AptosTransactionOutput, AptosVMBlockExecutorWrapper},
     data_cache::AsMoveResolver,
     sharded_block_executor::{
         local_executor_shard::{LocalExecutorClient, LocalExecutorService},
@@ -217,7 +217,7 @@ where
     ) -> (Vec<TransactionOutput>, usize) {
         let block_size = txn_provider.num_txns();
         let timer = Instant::now();
-        let output = BlockAptosVM::execute_block::<
+        let output = AptosVMBlockExecutorWrapper::execute_block::<
             _,
             NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>,
             DefaultTxnProvider<SignatureVerifiedTransaction>,
@@ -268,7 +268,7 @@ where
     ) -> (Vec<TransactionOutput>, usize) {
         let block_size = txn_provider.num_txns();
         let timer = Instant::now();
-        let output = BlockAptosVM::execute_block::<
+        let output = AptosVMBlockExecutorWrapper::execute_block::<
             _,
             NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>,
             DefaultTxnProvider<SignatureVerifiedTransaction>,

aptos-move/aptos-validator-interface/src/lib.rs

@@ -12,7 +12,7 @@ use aptos_types::{
     account_address::AccountAddress,
     state_store::{
         state_key::StateKey, state_storage_usage::StateStorageUsage, state_value::StateValue,
-        Result as StateViewResult, StateViewId, TStateView,
+        StateViewId, StateViewResult, TStateView,
     },
     transaction::{Transaction, TransactionInfo, Version},
 };

aptos-move/aptos-vm-environment/src/environment.rs

@@ -181,12 +181,12 @@ impl Environment {
         // If no chain ID is in storage, we assume we are in a testing environment.
         let chain_id = fetch_config_and_update_hash::<ChainId>(&mut sha3_256, state_view)
             .unwrap_or_else(ChainId::test);
-        let timestamp =
+        let timestamp_micros =
             fetch_config_and_update_hash::<ConfigurationResource>(&mut sha3_256, state_view)
-                .map(|config| config.last_reconfiguration_time())
+                .map(|config| config.last_reconfiguration_time_micros())
                 .unwrap_or(0);
 
-        let mut timed_features_builder = TimedFeaturesBuilder::new(chain_id, timestamp);
+        let mut timed_features_builder = TimedFeaturesBuilder::new(chain_id, timestamp_micros);
         if let Some(profile) = get_timed_feature_override() {
             // We need to ensure the override is taken into account for the hash.
             let profile_bytes = bcs::to_bytes(&profile)

aptos-move/aptos-vm-types/src/resolver.rs

@@ -5,7 +5,7 @@ use aptos_aggregator::resolver::{TAggregatorV1View, TDelayedFieldView};
 use aptos_types::{
     serde_helper::bcs_utils::size_u32_as_uleb128,
     state_store::{
-        errors::StateviewError,
+        errors::StateViewError,
         state_key::StateKey,
         state_storage_usage::StateStorageUsage,
         state_value::{StateValue, StateValueMetadata},
@@ -181,9 +181,9 @@ pub trait StateStorageView {
     fn id(&self) -> StateViewId;
 
     /// Reads the state value from the DB. Used to enforce read-before-write for module writes.
-    fn read_state_value(&self, state_key: &Self::Key) -> Result<(), StateviewError>;
+    fn read_state_value(&self, state_key: &Self::Key) -> Result<(), StateViewError>;
 
-    fn get_usage(&self) -> Result<StateStorageUsage, StateviewError>;
+    fn get_usage(&self) -> Result<StateStorageUsage, StateViewError>;
 }
 
 /// A fine-grained view of the state during execution.
@@ -289,12 +289,12 @@ where
         self.id()
     }
 
-    fn read_state_value(&self, state_key: &Self::Key) -> Result<(), StateviewError> {
+    fn read_state_value(&self, state_key: &Self::Key) -> Result<(), StateViewError> {
         self.get_state_value(state_key)?;
         Ok(())
     }
 
-    fn get_usage(&self) -> Result<StateStorageUsage, StateviewError> {
+    fn get_usage(&self) -> Result<StateStorageUsage, StateViewError> {
         self.get_usage().map_err(Into::into)
     }
 }