Vm upgrade

.backportrc.json

@@ -0,0 +1,12 @@
+{
+    "repoOwner": "aptos-labs",
+    "repoName": "aptos-core",
+
+    "branchLabelMapping": {
+        "^v(\\d+).(\\d+)$": "aptos-release-v$1.$2"
+    },
+    "commitConflicts": true,
+    "prTitle": "[cp][{{targetBranch}}] {{sourcePullRequest.title}}",
+    "targetPRLabels": ["cherry-pick"],
+    "assignees": ["thepomeranian"]
+}

.dockerignore

@@ -20,7 +20,7 @@
 !**/*.errmap
 !config/src/config/test_data
 !aptos-move/aptos-gas-profiling/templates/
-!aptos-move/aptos-release-builder/data/release.yaml
+!aptos-move/aptos-release-builder/data/*.yaml
 !aptos-move/aptos-release-builder/data/proposals/*
 !aptos-move/framework/
 !aptos-move/move-examples/hello_blockchain/

.github/actions/rust-check-merge-base/action.yaml

@@ -0,0 +1,19 @@
+name: Rust Check Merge Base
+description: Runs the rust merge base freshness check
+inputs:
+  GIT_CREDENTIALS:
+    description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
+    required: false
+
+runs:
+  using: composite
+  steps:
+    # The source code must be checked out by the workflow that invokes this action.
+    - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main
+      with:
+        GIT_CREDENTIALS: ${{ inputs.GIT_CREDENTIALS }}
+
+    # Check the freshness of the merge base
+    - name: Check the freshness of the merge base
+      run: cargo x check-merge-base -vvv
+      shell: bash

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

@@ -0,0 +1,16 @@
+name: Rust Doc Tests
+description: Runs only the rust doc tests
+inputs:
+  GIT_CREDENTIALS:
+    description: "Optional credentials to pass to git. Useful if you need to pull private repos for dependencies"
+    required: false
+
+runs:
+  using: composite
+  steps:
+    # The source code must be checked out by the workflow that invokes this action.
+
+    # Run the rust doc tests
+    - name: Run rust doc tests
+      run: cargo test --profile ci --locked --doc --workspace --exclude aptos-node-checker
+      shell: bash

.github/workflows/backport-to-release-branches.yaml

@@ -0,0 +1,38 @@
+name: Backport to Release Branches 
+
+on:
+  pull_request_target:
+    types: ["labeled", "closed"]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  permission-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check repository permission for user which triggered workflow
+        uses: sushichop/action-repository-permission@13d208f5ae7a6a3fc0e5a7c2502c214983f0241c
+        with:
+          required-permission: write
+          comment-not-permitted: Sorry, you don't have permission to trigger this workflow.
+
+  backport:
+    name: Backport PR
+    needs: [permission-check]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Backport Action
+        uses: sorenlouv/backport-github-action@ad888e978060bc1b2798690dd9d03c4036560947
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          add_original_reviewers: true 
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log        

CODEOWNERS

@@ -38,6 +38,9 @@
 # Owners for the `/consensus` directory and all its subdirectories.
 /consensus/ @zekun000 @sasha8 @ibalajiarun
 
+# Owners for consensus observer
+/consensus/src/consensus-observer/ @joshlind @zekun000
+
 # Owners for quorum store.
 /consensus/src/quorum_store/ @bchocho @sasha8 @gelash
 
@@ -74,7 +77,7 @@
 /crates/aptos-telemetry-service @ibalajiarun @geekflyer
 
 # Owners for the inspection-service crate
-/crates/inspection-service/ @joshlind @brianolson
+/crates/inspection-service/ @joshlind
 
 # Owners for the `/dashboards` directory and all its subdirectories.
 /dashboards/ @aptos-labs/prod-eng
@@ -90,7 +93,7 @@
 /mempool/ @bchocho
 
 # Owners for the network and all its subdirectories.
-/network/ @joshlind @brianolson
+/network/ @joshlind @zekun000
 
 # Owners for the scripts
 /scripts/ @aptos-labs/prod-eng