Merge branch 'master' into wen_restart_modify_heaviest_fork_aggregate

.github/scripts/install-all-deps.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+os_name="$1"
+
+# shellcheck source=.github/scripts/install-openssl.sh
+source "$here/install-openssl.sh" "$os_name"
+# shellcheck source=.github/scripts/install-proto.sh
+source "$here/install-proto.sh" "$os_name"

.github/scripts/install-openssl.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+
+os_name="$1"
+
+case "$os_name" in
+"Windows")
+  choco install openssl --version 3.3.2 --install-arguments="'/DIR=C:\OpenSSL'" -y
+  export OPENSSL_LIB_DIR="C:\OpenSSL\lib\VC\x64\MT"
+  export OPENSSL_INCLUDE_DIR="C:\OpenSSL\include"
+  ;;
+"macOS") ;;
+"Linux") ;;
+*)
+  echo "Unknown Operating System"
+  ;;
+esac

.github/scripts/cargo-clippy-before-script.sh → .github/scripts/install-proto.sh

@@ -6,8 +6,6 @@ os_name="$1"
 
 case "$os_name" in
 "Windows")
-  vcpkg install openssl:x64-windows-static-md
-  vcpkg integrate install
   choco install protoc
   export PROTOC='C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe'
   ;;

.github/workflows/cargo.yml

@@ -41,11 +41,16 @@ jobs:
         with:
           version: "v0.8.1"
 
-      - shell: bash
-        run: .github/scripts/cargo-clippy-before-script.sh ${{ runner.os }}
+      # took the workaround from https://github.com/sfackler/rust-openssl/issues/2149
+      - name: Set Perl environment variables
+        if: runner.os == 'Windows'
+        run: |
+          echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
 
       - shell: bash
         run: |
+          source .github/scripts/install-all-deps.sh ${{ runner.os }}
           source ci/rust-version.sh nightly
           rustup component add clippy --toolchain "$rust_nightly"
           scripts/cargo-clippy-nightly.sh

.github/workflows/release-artifacts.yml

@@ -39,14 +39,19 @@ jobs:
         run: |
           git checkout ${{ inputs.commit }}
 
+      # took the workaround from https://github.com/sfackler/rust-openssl/issues/2149
+      - name: Set Perl environment variables
+        run: |
+          echo "PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          echo "OPENSSL_SRC_PERL=$((where.exe perl)[0])" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+
       - name: Build
         id: build
         shell: bash
         run: |
-          vcpkg install openssl:x64-windows-static-md
-          vcpkg integrate install
-          choco install protoc
-          export PROTOC="C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe"
+          # install all deps
+          source .github/scripts/install-all-deps.sh ${{ runner.os }}
+
           source /tmp/env.sh
           echo "tag=$CI_TAG" >> $GITHUB_OUTPUT
           eval "$(ci/channel-info.sh)"

CHANGELOG.md

@@ -37,10 +37,24 @@ or
 tools-version = "1.43"
 ```
 The order of precedence for the chosen tools version goes: `--tools-version` argument, package version, workspace version, and finally default version.
+  * `package-metadata`: specify a program's id in Cargo.toml for easy consumption by downstream users and tools using `solana-package-metadata` (#1806). For example:
+```toml
+[package.metadata.solana]
+program-id = "MyProgram1111111111111111111111111111111111"
+```
+Can be consumed in the program crate:
+```rust
+solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
+```
+This is equivalent to writing:
+```rust
+solana_pubkey::declare_id!("MyProgram1111111111111111111111111111111111");
+```
   * `agave-validator`: Update PoH speed check to compare against current hash rate from a Bank (#2447)
   * `solana-test-validator`: Add `--clone-feature-set` flag to mimic features from a target cluster (#2480)
   * `solana-genesis`: the `--cluster-type` parameter now clones the feature set from the target cluster (#2587)
   * `unified-scheduler` as default option for `--block-verification-method` (#2653)
+  * warn that `thread-local-multi-iterator` option for `--block-production-method` is deprecated (#3113)
 
 ## [2.0.0]
 * Breaking