fix: merge

.buildkite/scripts/build-bench.sh

@@ -22,5 +22,5 @@ EOF
 
 # shellcheck disable=SC2016
 group "bench" \
-  "$(build_steps "bench-part-1" "ci/bench/part1.sh")" \
-  "$(build_steps "bench-part-2" "ci/bench/part2.sh")"
+  "$(build_steps "bench-part-1" ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/bench/part1.sh")" \
+  "$(build_steps "bench-part-2" ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/bench/part2.sh")"

.github/scripts/cargo-clippy-before-script.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+os_name="$1"
+
+case "$os_name" in
+"Windows")
+  ;;
+"macOS")
+  brew install protobuf
+  ;;
+"Linux") ;;
+*)
+  echo "Unknown Operating System"
+  ;;
+esac

.github/workflows/cargo.yml

@@ -0,0 +1,71 @@
+name: Cargo
+
+on:
+  push:
+    branches:
+      - master
+      - v[0-9]+.[0-9]+
+  pull_request:
+    branches:
+      - master
+      - v[0-9]+.[0-9]+
+    paths:
+      - "**.rs"
+      - "**/Cargo.toml"
+      - "**/Cargo.lock"
+      - ".github/scripts/cargo-clippy-before-script.sh"
+      - ".github/workflows/cargo.yml"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  SHELL: /bin/bash
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+
+jobs:
+  clippy-stable:
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: mozilla-actions/[email protected]
+        with:
+          version: "v0.5.4"
+
+      - shell: bash
+        run: .github/scripts/cargo-clippy-before-script.sh ${{ runner.os }}
+
+      - shell: bash
+        run: |
+          source ci/rust-version.sh stable
+          rustup component add clippy --toolchain "$rust_stable"
+          scripts/cargo-clippy-stable.sh
+
+  clippy-nightly:
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: mozilla-actions/[email protected]
+        with:
+          version: "v0.5.4"
+
+      - shell: bash
+        run: .github/scripts/cargo-clippy-before-script.sh ${{ runner.os }}
+
+      - shell: bash
+        run: |
+          source ci/rust-version.sh nightly
+          rustup component add clippy --toolchain "$rust_nightly"
+          scripts/cargo-clippy-nightly.sh

.github/workflows/downstream-project-anchor.yml

@@ -0,0 +1,53 @@
+name: Downstream Project - Anchor
+
+on:
+  push:
+    branches:
+      - master
+      - v[0-9]+.[0-9]+
+  pull_request:
+    branches:
+      - master
+      - v[0-9]+.[0-9]+
+    paths:
+      - "**.rs"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - "cargo-build-bpf"
+      - "cargo-test-bpf"
+      - "cargo-build-sbf"
+      - "cargo-test-sbf"
+      - ".github/workflows/downstream-project-anchor.yml"
+  workflow_call:
+    inputs:
+      branch:
+        required: false
+        type: string
+        default: "master"
+
+env:
+  SHELL: /bin/bash
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: ["v0.29.0"]
+    steps:
+      - uses: actions/checkout@v3
+
+      - shell: bash
+        run: |
+          .github/scripts/purge-ubuntu-runner.sh
+
+      - uses: mozilla-actions/[email protected]
+        with:
+          version: "v0.5.4"
+
+      - shell: bash
+        run: |
+          source .github/scripts/downstream-project-spl-install-deps.sh
+          ./scripts/build-downstream-anchor-projects.sh ${{ matrix.version }}

.gitignore

@@ -1,5 +1,4 @@
-/dos/farf/
-/farf/
+farf/
 /solana-release/
 /solana-release.tar.bz2
 /solana-metrics/

.mergify.yml

@@ -58,6 +58,24 @@ pull_request_rules:
           # only require docs checks if docs files changed
           - -files~=^docs/
           - status-success=build & deploy docs
+        - or:
+          - -files~=(\.rs|Cargo\.toml|Cargo\.lock|\.github/scripts/cargo-clippy-before-script\.sh|\.github/workflows/cargo\.yml)$
+          - and:
+            - check-success=clippy-stable (macos-latest)
+            - check-success=clippy-nightly (macos-latest)
+        - or:
+          - -files~=(\.rs|Cargo\.toml|Cargo\.lock|cargo-build-bpf|cargo-test-bpf|cargo-build-sbf|cargo-test-sbf|ci/downstream-projects/run-spl\.sh|\.github/workflows/downstream-project-spl\.yml)$
+          - and:
+            - status-success=cargo-test-sbf (token/program)
+            - status-success=cargo-test-sbf (instruction-padding/program, token/program-2022, token/program-2022-test)
+            - status-success=cargo-test-sbf (associated-token-account/program, associated-token-account/program-test)
+            - status-success=cargo-test-sbf (token-upgrade/program)
+            - status-success=cargo-test-sbf (feature-proposal/program)
+            - status-success=cargo-test-sbf (governance/addin-mock/program, governance/program)
+            - status-success=cargo-test-sbf (memo/program)
+            - status-success=cargo-test-sbf (name-service/program)
+            - status-success=cargo-test-sbf (stake-pool/program)
+            - status-success=cargo-test-sbf (single-pool/program)
     actions:
       merge:
         method: squash
@@ -98,6 +116,19 @@ pull_request_rules:
         ignore_conflicts: true
         branches:
           - v1.16
+  - name: v1.16 backport warning comment
+    conditions:
+      - label=v1.16
+    actions:
+      comment:
+        message: >
+          Backports to the stable branch are to be avoided unless absolutely
+          necessary for fixing bugs, security issues, and perf regressions.
+          Changes intended for backport should be structured such that a
+          minimum effective diff can be committed separately from any
+          refactoring, plumbing, cleanup, etc that are not strictly
+          necessary to achieve the goal. Any of the latter should go only
+          into master and ride the normal stabilization schedule.
   - name: v1.17 feature-gate backport
     conditions:
       - label=v1.17
@@ -122,6 +153,21 @@ pull_request_rules:
         ignore_conflicts: true
         branches:
           - v1.17
+  - name: v1.17 backport warning comment
+    conditions:
+      - label=v1.17
+    actions:
+      comment:
+        message: >
+          Backports to the beta branch are to be avoided unless absolutely
+          necessary for fixing bugs, security issues, and perf regressions.
+          Changes intended for backport should be structured such that a
+          minimum effective diff can be committed separately from any
+          refactoring, plumbing, cleanup, etc that are not strictly
+          necessary to achieve the goal. Any of the latter should go only
+          into master and ride the normal stabilization schedule. Exceptions
+          include CI/metrics changes, CLI improvements and documentation
+          updates on a case by case basis.
 
 commands_restrictions:
   # The author of copied PRs is the Mergify user.

CHANGELOG.md

@@ -1,10 +1,11 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 Please follow the [guidance](#adding-to-this-changelog) at the bottom of this file when making changes
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
-and follows a [Backwards Compatibility Policy](https://docs.solana.com/developing/backwards-compatibility)
+and follows a [Backwards Compatibility Policy](https://docs.solanalabs.com/backwards-compatibility)
 
 Release channels have their own copy of this changelog:
 * [edge - v1.18](#edge-channel)
@@ -16,11 +17,27 @@ Release channels have their own copy of this changelog:
 * Changes
   * Added a github check to support `changelog` label
   * The default for `--use-snapshot-archives-at-startup` is now `when-newest` (#33883)
+    * The default for `solana-ledger-tool`, however, remains `always` (#34228)
+  * Added `central-scheduler` option for `--block-production-method` (#33890)
+  * Updated to Borsh v1
+  * Added allow_commission_decrease_at_any_time feature which will allow commission on a vote account to be
+    decreased even in the second half of epochs when the commission_updates_only_allowed_in_first_half_of_epoch
+    feature would have prevented it
+  * Updated local ledger storage so that the RPC endpoint
+    `getSignaturesForAddress` always returns signatures in block-inclusion order
+  * RPC's `simulateTransaction` now returns `innerInstructions` as `json`/`jsonParsed` (#34313).
+  * Bigtable upload now includes entry summary data for each slot, stored in a
+    new `entries` table
 * Upgrade Notes
+  * `solana-program` and `solana-sdk` default to support for Borsh v1, with
+limited backward compatibility for v0.10 and v0.9. Please upgrade to Borsh v1.
+  * Operators running their own bigtable instances need to create the `entries`
+    table before upgrading their warehouse nodes
 
 ## [1.17.0]
 * Changes
   * Added a changelog.
+  * Added `--use-snapshot-archives-at-startup` for faster validator restarts
 * Upgrade Notes
 
 ## Adding to this Changelog

CONTRIBUTING.md

@@ -315,17 +315,17 @@ Inventing new terms is allowed, but should only be done when the term is widely
 used and understood. Avoid introducing new 3-letter terms, which can be
 confused with 3-letter acronyms.
 
-[Terms currently in use](docs/src/terminology.md)
+[Terms currently in use](https://solana.com/docs/terminology)
 
 
 ## Design Proposals
 
-Solana's architecture is described by docs generated from markdown files in the `docs/src/`
-directory and viewable on the official [Solana Documentation](https://docs.solana.com) website.
+This Solana validator client's architecture is described by docs generated from markdown files in the `docs/src/`
+directory and viewable on the official [Solana Labs Validator Client](https://docs.solanalabs.com) documentation website.
 
 Current design proposals may be viewed on the docs site:
 
-1. [Accepted Proposals](https://docs.solana.com/proposals/accepted-design-proposals)
-2. [Implemented Proposals](https://docs.solana.com/implemented-proposals/implemented-proposals)
+1. [Accepted Proposals](https://docs.solanalabs.com/proposals/accepted-design-proposals)
+2. [Implemented Proposals](https://docs.solanalabs.com/implemented-proposals/implemented-proposals)
 
 New design proposals should follow this guide on [how to submit a design proposal](./docs/src/proposals.md#submit-a-design-proposal).