Merge remote-tracking branch 'soon-origin/master' into prio-scheduler…

…-crate

.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)"

Cargo.toml

@@ -149,6 +149,7 @@ members = [
  "tokens",
  "tps-client",
  "tpu-client",
+ "tpu-client-next",
  "transaction-dos",
  "transaction-metrics-tracker",
  "transaction-status",
@@ -224,7 +225,7 @@ bs58 = { version = "0.5.1", default-features = false }
 bv = "0.11.1"
 byte-unit = "4.0.19"
 bytecount = "0.6.8"
-bytemuck = "1.18.0"
+bytemuck = "1.19.0"
 bytemuck_derive = "1.8.0"
 byteorder = "1.5.0"
 bytes = "1.7"
@@ -262,6 +263,7 @@ etcd-client = "0.11.1"
 fast-math = "0.1"
 fd-lock = "3.0.13"
 flate2 = "1.0.31"
+five8_const = "0.1.3"
 fnv = "1.0.7"
 fs_extra = "1.3.0"
 futures = "0.3.31"