Merge remote-tracking branch 'upstream/main'

.cargo/config.toml

@@ -10,6 +10,7 @@ xclippy = [
   "-Aclippy::enum-variant-names",
   "-Aclippy::result-large-err",
   "-Aclippy::mutable-key-type",
+  "-Aclippy::map_identity",  # We temporarily ignore this due to: https://github.com/rust-lang/rust-clippy/issues/11764
 ]
 x = "run --package aptos-cargo-cli --bin aptos-cargo-cli --"
 

.github/actions/move-tests-compiler-v2/action.yaml

@@ -23,7 +23,7 @@ runs:
 
     # Run Aptos Move tests with compiler V2
     - name: Run Aptos Move tests with compiler V2
-      run: cargo nextest run --profile ci --locked -p e2e-move-tests -p aptos-framework --retries 3 --no-fail-fast
+      run: cargo nextest run --release -E 'not (test(test_smart_data_structures_gas))' --profile ci --locked -p e2e-move-tests -p aptos-framework --retries 3 --no-fail-fast
       shell: bash
       env:
         MOVE_COMPILER_EXP: no-safety

.github/workflows/docker-build-test.yaml

@@ -322,17 +322,15 @@ jobs:
       !failure() && !cancelled() && needs.permission-check.result == 'success' && (
         (github.event_name == 'push' && github.ref_name != 'main') ||
         github.event_name == 'workflow_dispatch' ||
-        contains(github.event.pull_request.labels.*.name, 'CICD:run-e2e-tests') ||
-        github.event.pull_request.auto_merge != null ||
-        contains(github.event.pull_request.body, '#e2e')
+        contains(github.event.pull_request.labels.*.name, 'CICD:run-framework-upgrade-test')
       )
     uses: aptos-labs/aptos-core/.github/workflows/workflow-run-forge.yaml@main
     secrets: inherit
     with:
       GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
       FORGE_TEST_SUITE: framework_upgrade
       IMAGE_TAG: aptos-node-v1.8.3 # This workflow will test the upgradability from the current tip of the release branch to the current main branch.
-      FORGE_RUNNER_DURATION_SECS: 300
+      FORGE_RUNNER_DURATION_SECS: 3600
       COMMENT_HEADER: forge-framework-upgrade
       FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
       SKIP_JOB: ${{ needs.file_change_determinator.outputs.only_docs_changed == 'true' }}

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

@@ -50,54 +50,6 @@ jobs:
         id: determine_file_changes
         uses: ./.github/actions/file-change-determinator
 
-  # Run sequential execution performance tests
-  sequential-execution-performance:
-    needs: file_change_determinator
-    timeout-minutes: 30
-    runs-on: ${{ inputs.RUNNER_NAME }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.GIT_SHA }}
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed != 'true' && inputs.IS_FULL_RUN }}
-
-      - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-        with:
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed != 'true' && inputs.IS_FULL_RUN }}
-
-      - name: Run sequential execution benchmark in performance build mode
-        shell: bash
-        run: testsuite/sequential_execution_performance.py
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed != 'true' && inputs.IS_FULL_RUN }}
-
-      - run: echo "Skipping sequential execution performance!"
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed == 'true' || !inputs.IS_FULL_RUN }}
-
-  # Run parallel execution performance tests
-  parallel-execution-performance:
-    needs: file_change_determinator
-    timeout-minutes: 60
-    runs-on: ${{ inputs.RUNNER_NAME }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.GIT_SHA }}
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed != 'true' && inputs.IS_FULL_RUN }}
-
-      - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
-        with:
-          GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed != 'true' && inputs.IS_FULL_RUN }}
-
-      - name: Run parallel execution benchmark in performance build mode
-        shell: bash
-        run: testsuite/parallel_execution_performance.py
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed != 'true' && inputs.IS_FULL_RUN }}
-
-      - run: echo "Skipping parallel execution performance!"
-        if: ${{ needs.file_change_determinator.outputs.only_docs_changed == 'true' || !inputs.IS_FULL_RUN }}
-
   # Run single node execution performance tests
   single-node-performance:
     needs: file_change_determinator

CODEOWNERS

@@ -11,16 +11,15 @@
 /aptos-move/aptos-gas/ @vgao1996
 /aptos-move/aptos-vm/ @davidiw @wrwg @zekun000 @vgao1996 @georgemitenkov
 /aptos-move/aptos-vm-types/ @georgemitenkov @gelash @vgao1996
-/aptos-move/e2e-tests/src/account.rs @alinush
 /aptos-move/framework/ @davidiw @movekevin @wrwg
 /aptos-move/framework/aptos-framework/sources/account.move @alinush
-/aptos-move/framework/aptos-stdlib/sources/cryptography/ @alinush
+/aptos-move/framework/aptos-stdlib/sources/cryptography/ @alinush @zjma @mstraka100
 /aptos-move/framework/**/*.spec.move @junkil-park
 /aptos-move/framework/aptos-stdlib/sources/hash.move @alinush
 
 # Owner for aptos-token, cryptography natives, parallel-executor and vm-genesis.
 /aptos-move/framework/aptos-token @areshand
-/aptos-move/framework/src/natives/cryptography/ @alinush
+/aptos-move/framework/src/natives/cryptography/ @alinush @zjma @mstraka100
 /aptos-move/framework/src/natives/aggregator_natives/ @georgemitenkov @gelash @zekun000
 /aptos-move/block-executor/ @gelash @zekun000 @sasha8 @danielxiangzl
 /aptos-move/sharded_block-executor/ @sitalkedia
@@ -43,8 +42,8 @@
 /crates/aptos @gregnazario @0xjinn @banool
 
 # Owners for the `/crates/aptos-crypto*` directories.
-/crates/aptos-crypto-derive/ @alinush
-/crates/aptos-crypto/ @alinush
+/crates/aptos-crypto-derive/ @alinush @zjma @mstraka100 @rex1fernando
+/crates/aptos-crypto/ @alinush @zjma @mstraka100 @rex1fernando
 
 # Owners for the `/crates/aptos-faucet` directory and all its subdirectories. And other faucet, genesis, and OpenAPI-related crates.
 /crates/aptos-faucet @banool @gregnazario
@@ -91,7 +90,7 @@
 /ecosystem/typescript/sdk @gregnazario @banool @0xmaayan @0xjinn
 
 # Owners for execution and storage.
-/execution/ @msmouse @lightmark
+/execution/ @msmouse @lightmark @grao1991
 
 # Owners for mempool.
 /mempool/ @bchocho
@@ -103,12 +102,12 @@
 /state-sync/ @joshlind
 
 # Owners for execution and storage.
-/storage/ @msmouse @lightmark
+/storage/ @msmouse @lightmark @grao1991
 
 # Owners for the `/terraform` directory and all its subdirectories.
 /terraform/ @aptos-labs/prod-eng
 
 # Owners for the `aptos-dkg` crate.
-/crates/aptos-dkg @alinush
+/crates/aptos-dkg @alinush @rex1fernando
 
-/types/src/transaction/authenticator.rs @alinush
+/types/src/transaction/authenticator.rs @alinush @mstraka100