Monza

.dockerignore

@@ -31,6 +31,8 @@
 !crates/indexer/migrations/**/*.sql
 !ecosystem/indexer-grpc/indexer-grpc-parser/migrations/**/*.sql
 !ecosystem/nft-metadata-crawler-parser/migrations/**/*.sql
+!rust-toolchain.toml
+!scripts/
 !terraform/helm/aptos-node/
 !terraform/helm/genesis/
 !testsuite/forge/src/backend/k8s/

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,44 @@
-### Description
+## Description
+<!-- Please include a summary of the change, including which issue it fixes or what feature it adds. Include relevant motivation, context and documentation as appropriate. List dependencies that are required for this change, if any. -->
 
-### Test Plan
-<!-- Please provide us with clear details for verifying that your changes work. -->
+## Type of Change
+- [ ] New feature
+- [ ] Bug fix
+- [ ] Breaking change
+- [ ] Performance improvement
+- [ ] Refactoring
+- [ ] Dependency update
+- [ ] Documentation update
+
+## Which Components or Systems Does This Change Impact?
+- [ ] Validator Node
+- [ ] Full Node (API, Indexer, etc.)
+- [ ] Move/Aptos Virtual Machine
+- [ ] Aptos Framework
+- [ ] Aptos CLI/SDK
+- [ ] Developer Infrastructure
+- [ ] Other (specify)
+
+## How Has This Been Tested?
+<!--
+- Please ensure that the functionality introduced by this change is well tested and verified to work as expected.
+- Ensure tests cover both happy and unhappy paths.
+- List and link relevant tests.
+-->
+
+## Key Areas to Review
+<!--
+- Identify any critical parts of the code that require special attention or understanding. Explain why these parts are crucial to the functionality or architecture of the project.
+- Point out any areas where complex logic has been implemented. Provide a brief explanation of the logic and your approach to make it easier for reviewers to follow.
+- Highlight any areas where you are particularly concerned or unsure about the code's impact on the change. This can include potential performance or security issues, or compatibility with existing features.
+-->
+
+## Checklist
+- [ ] I have read and followed the [CONTRIBUTING](https://github.com/aptos-labs/aptos-core/blob/main/CONTRIBUTING.md) doc
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I identified and added all stakeholders and component owners affected by this change as reviewers
+- [ ] I tested both happy and unhappy path of the functionality
+- [ ] I have made corresponding changes to the documentation
+
+<!-- Thank you for your contribution! -->

.github/actions/general-lints/action.yaml

@@ -8,10 +8,7 @@ inputs:
 runs:
   using: composite
   steps:
-    # Checkout the repository
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+    # The source code must be checkout out by the workflow that invokes this action.
 
     # Install shellcheck and run it on the dev_setup.sh script
     - name: Run shell lints

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

@@ -26,7 +26,6 @@ runs:
       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
         MOVE_COMPILER_V2: true
         RUST_MIN_STACK: 4297152
         MVP_TEST_ON_CI: true

.github/actions/python-lint-tests/action.yaml

@@ -4,20 +4,15 @@ inputs:
   GIT_SHA:
     description: "Optional git sha to checkout"
     required: false
-    type: string
 
 runs:
   using: composite
   steps:
-    - uses: actions/checkout@v3
-      with:
-        ref: ${{ inputs.GIT_SHA }}
-        # Get enough commits to compare to
-        fetch-depth: 100
+    # The source code must be checkout out by the workflow that invokes this action.
 
     - name: Get changed files
       id: changed-files
-      uses: tj-actions/changed-files@60f4aabced9b4718c75acef86d42ffb631c4403a # [email protected]
+      uses: tj-actions/changed-files@v42
 
     - uses: ./.github/actions/python-setup
       with:

.github/actions/run-faucet-tests/action.yaml

@@ -50,7 +50,7 @@ runs:
     # we don't pass the image tag.
     - name: Run integration tests
       if: ${{ inputs.NETWORK != 'custom' }}
-      run: poetry run python main.py --base-network ${{ inputs.NETWORK }} ${{ endif }} --external-test-dir ${{ runner.temp }}/testnet --image-repo-with-project ${{ inputs.GCP_DOCKER_ARTIFACT_REPO }}
+      run: poetry run python main.py --base-network ${{ inputs.NETWORK }} --external-test-dir ${{ runner.temp }}/testnet --image-repo-with-project ${{ inputs.GCP_DOCKER_ARTIFACT_REPO }}
       working-directory: crates/aptos-faucet/integration-tests
       shell: bash
 

.github/actions/rust-lints/action.yaml

@@ -8,10 +8,8 @@ inputs:
 runs:
   using: composite
   steps:
-    # Checkout the repository and setup the rust toolchain
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+    # The source code must be checkout out by the workflow that invokes this action.
+
     - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
       with:
         GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}

.github/actions/rust-setup/action.yaml

@@ -1,7 +1,13 @@
+name: "Rust Setup"
+description: "Setup the rust toolchain and cache"
 inputs:
   GIT_CREDENTIALS:
     description: "Optional credentials to pass to git"
     required: false
+  ADDITIONAL_KEY:
+    description: "An optional additional key to pass to rust-cache"
+    required: false
+    default: ""
 
 runs:
   using: composite
@@ -15,6 +21,8 @@ runs:
     # https://github.com/Swatinem/rust-cache#cache-details
     - name: Run cargo cache
       uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # [email protected]
+      with:
+        key: ${{ inputs.ADDITIONAL_KEY }}
 
     - name: install protoc and related tools
       shell: bash

.github/actions/rust-smoke-tests/action.yaml

@@ -8,10 +8,8 @@ inputs:
 runs:
   using: composite
   steps:
-    # Checkout the repository and setup the rust toolchain
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+    # The source code must be checkout out by the workflow that invokes this action.
+
     - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
       with:
         GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}

.github/actions/rust-unit-tests/action.yaml

@@ -8,10 +8,8 @@ inputs:
 runs:
   using: composite
   steps:
-    # Checkout the repository and setup the rust toolchain
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+    # The source code must be checkout out by the workflow that invokes this action.
+
     - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
       with:
         GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
@@ -42,8 +40,8 @@ runs:
       shell: bash
       env:
         INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
-        RUST_MIN_STACK: 4297152
-        MVP_TEST_ON_CI: true
+        RUST_MIN_STACK: "4297152"
+        MVP_TEST_ON_CI: "true"
         SOLC_EXE: /home/runner/bin/solc
         Z3_EXE: /home/runner/bin/z3
         CVC5_EXE: /home/runner/bin/cvc5

.github/workflows/aptos-node-release.yaml

@@ -32,7 +32,7 @@ jobs:
           aptos_node_cargo_toml: aptos-node/Cargo.toml
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f # pin@v4
+        uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # pin@v6.0.1
         with:
           add-paths: aptos-node
           title: "[aptos-node] update release version"

.github/workflows/copy-images-to-dockerhub-release.yaml

@@ -8,6 +8,7 @@ on:
       - mainnet
       # preview branches
       - preview
+      - preview-networking
       # aptos-indexer-grpc network-specific release branches
       - aptos-indexer-grpc-devnet
       - aptos-indexer-grpc-testnet

.github/workflows/coverage-move-only.yaml

@@ -50,7 +50,7 @@ jobs:
         with:
           tool: nextest,cargo-llvm-cov
       - run: docker run --detach -p 5432:5432 cimg/postgres:14.2
-      - run: cargo llvm-cov --ignore-run-fail -p aptos-framework -p "move*" -p e2e-move-tests --lcov --jobs 32 --output-path lcov_unit.info
+      - run: cargo llvm-cov --ignore-run-fail -p aptos-framework -p "move*" --lcov --jobs 32 --output-path lcov_unit.info
         env:
           INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres
       - uses: actions/upload-artifact@v3

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

@@ -36,8 +36,8 @@ on: # build on main branch OR when a PR is labeled with `CICD:build-images`
       - aptos-release-v*
       # experimental branches
       - performance_benchmark
-      - quorum-store
       - preview
+      - preview-networking
       # grpc release branches
       - aptos-indexer-grpc-devnet
       - aptos-indexer-grpc-testnet
@@ -302,7 +302,7 @@ jobs:
     with:
       GIT_SHA: ${{ needs.determine-docker-build-metadata.outputs.gitSha }}
       FORGE_TEST_SUITE: compat
-      IMAGE_TAG: aptos-node-v1.8.3 # test against a previous testnet release
+      IMAGE_TAG: aptos-node-v1.9.5 # test against a previous testnet release
       FORGE_RUNNER_DURATION_SECS: 300
       COMMENT_HEADER: forge-compat
       FORGE_NAMESPACE: forge-compat-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}
@@ -329,7 +329,7 @@ jobs:
     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.
+      IMAGE_TAG: aptos-node-v1.9.5 # This workflow will test the upgradability from the current tip of the release branch to the current main branch.
       FORGE_RUNNER_DURATION_SECS: 3600
       COMMENT_HEADER: forge-framework-upgrade
       FORGE_NAMESPACE: forge-framework-upgrade-${{ needs.determine-docker-build-metadata.outputs.targetCacheId }}

.github/workflows/docker-update-images.yaml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Create Pull Request
         if: ${{ steps.check_update.outputs.NEED_UPDATE == 'True' }}
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # [email protected]
         with:
           token: ${{ secrets.REPO_TOKEN }}
           commit-message: "Update Docker images"

.github/workflows/lint-test.yaml

@@ -31,7 +31,7 @@ jobs:
     outputs:
       only_docs_changed: ${{ steps.determine_file_changes.outputs.only_docs_changed }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run the file change determinator
         id: determine_file_changes
         uses: ./.github/actions/file-change-determinator
@@ -41,8 +41,10 @@ jobs:
     needs: file_change_determinator
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
+        with:
+          fetch-depth: 0 # get all the history because python-lint-tests requires it.
       - name: Run general lints
         uses: ./.github/actions/general-lints
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
@@ -57,7 +59,7 @@ jobs:
     runs-on: high-perf-docker
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
         with:
@@ -69,8 +71,10 @@ jobs:
     needs: file_change_determinator
     runs-on: high-perf-docker
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
+        with:
+          fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
       - name: Run rust lints
         uses: ./.github/actions/rust-lints
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
@@ -92,7 +96,7 @@ jobs:
       )
     runs-on: high-perf-docker
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
       - name: Run rust smoke tests
         uses: ./.github/actions/rust-smoke-tests
@@ -107,7 +111,7 @@ jobs:
     needs: file_change_determinator
     runs-on: high-perf-docker
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: needs.file_change_determinator.outputs.only_docs_changed != 'true'
       - name: Run rust unit tests
         uses: ./.github/actions/rust-unit-tests
@@ -122,9 +126,7 @@ jobs:
     runs-on: high-perf-docker
     if: contains(github.event.pull_request.labels.*.name, 'CICD:build-consensus-only-image')
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+      - uses: actions/checkout@v4
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
         with:
           GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
@@ -140,9 +142,7 @@ jobs:
     runs-on: high-perf-docker
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it.
+      - uses: actions/checkout@v4
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
         with:
           GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
@@ -158,7 +158,7 @@ jobs:
     runs-on: high-perf-docker
     if: contains(github.event.pull_request.labels.*.name, 'CICD:build-consensus-only-image')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
         with:
           GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}
@@ -186,7 +186,7 @@ jobs:
     runs-on: high-perf-docker
     if: contains(github.event.pull_request.labels.*.name, 'CICD:non-required-tests')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
         with:
           GIT_CREDENTIALS: ${{ secrets.GIT_CREDENTIALS }}