rebase

.github/CODEOWNERS

@@ -8,10 +8,9 @@
 /programs/loader-v4/ @anza-xyz/svm
 /runtime-transaction/ @anza-xyz/tx-metadata
 /svm-conformance/ @anza-xyz/svm
-/svm-rent-collector/ @anza-xyz/svm
 /svm-transaction/ @anza-xyz/svm
 /svm/ @anza-xyz/svm
 /svm/examples/Cargo.lock
 /svm-callback/ @anza-xyz/svm
 /transaction-context/ @anza-xyz/svm
-/transaction-view/ @anza-xyz/tx-metadata
+/transaction-view/ @anza-xyz/tx-metadata

.github/scripts/install-openssl.sh

@@ -6,9 +6,29 @@ os_name="$1"
 
 case "$os_name" in
 "Windows")
-  choco install openssl --version 3.4.1 --install-arguments="'/DIR=C:\OpenSSL'" -y
-  export OPENSSL_LIB_DIR="C:\OpenSSL\lib\VC\x64\MT"
-  export OPENSSL_INCLUDE_DIR="C:\OpenSSL\include"
+  # initialize vcpkg.json. the builtin-baseline is the commit that contains required version.
+  # the commit hash can be found in https://github.com/microsoft/vcpkg with `git log --pretty=format:"%H %s" | grep openssl`
+  # can be verified with:
+  # web:
+  #     https://github.com/microsoft/vcpkg/blob/__COMMIT_HASH__/versions/o-/openssl.json
+  # command:
+  #     git show __COMMIT_HASH__:versions/o-/openssl.json
+  cat > vcpkg.json <<EOL
+{
+  "dependencies": ["openssl"],
+  "overrides": [
+    {
+      "name": "openssl",
+      "version": "3.4.1"
+    }
+  ],
+  "builtin-baseline": "5ee5eee0d3e9c6098b24d263e9099edcdcef6631"
+}
+EOL
+  vcpkg install --triplet x64-windows-static-md
+  rm vcpkg.json
+  export OPENSSL_LIB_DIR="$PWD/vcpkg_installed/x64-windows-static-md/lib"
+  export OPENSSL_INCLUDE_DIR="$PWD/vcpkg_installed/x64-windows-static-md/include"
   ;;
 "macOS") ;;
 "Linux")

.github/workflows/benchmark.yml

@@ -35,7 +35,7 @@ jobs:
             }
           - {
               name: "solana-gossip",
-              commands: ["cargo +$rust_nightly bench -p solana-gossip"],
+              commands: ["cargo bench -p solana-gossip -- --output-format bencher --noplot"],
             }
           - {
               name: "solana-poh",

.mergify.yml

@@ -217,6 +217,20 @@ pull_request_rules:
           If this PR represents a change to a native program implementation (not
           tests), please include a reviewer from the Firedancer team. And please
           keep refactors to a minimum.
+  - name: Notify about future move of zk-keygen, zk-sdk, and zk-token-sdk
+    conditions:
+      - or:
+        - files~=^zk-keygen/
+        - files~=^zk-sdk/
+        - files~=^zk-token-sdk/
+    actions:
+      comment:
+        message: |
+          For your information, the `zk-keygen` and `zk-sdk` directories are
+          scheduled to be relocated to `solana-program/zk-elgamal-proof` in a
+          separate repository. Additionally, the `zk-token-sdk` directory will
+          be removed. Please take these upcoming changes into account when
+          making modifications.
 
 commands_restrictions:
   # The author of copied PRs is the Mergify user.

CHANGELOG.md

@@ -15,9 +15,19 @@ Release channels have their own copy of this changelog:
 <a name="edge-channel"></a>
 ## 3.0.0 - Unreleased
 
+### RPC
+
+#### Breaking
+* Added a `slot` property to `EpochRewardsPeriodActiveErrorData`
+* Added error data containing a `slot` property to `RpcCustomError::SlotNotEpochBoundary`
+
+#### Changes
+* The subscription server now prioritizes processing received messages before sending out responses. This ensures that new subscription requests and time-sensitive messages like `PING` opcodes take priority over notifications.
+
 ### Validator
 
 #### Breaking
+* Require increased `memlock` limits - recommended setting is `LimitMEMLOCK=2000000000` in systemd service configuration. Lack of sufficient limit (on Linux) will cause startup error.
 * Remove deprecated arguments
   * `--accounts-index-memory-limit-mb`
   * `--accountsdb-repl-bind-address`, `--accountsdb-repl-port`, `--accountsdb-repl-threads`, `--enable-accountsdb-repl`
@@ -32,7 +42,8 @@ Release channels have their own copy of this changelog:
 * Using `--snapshot-interval-slots 0` to disable generating snapshots has been removed. Use `--no-snapshots` instead.
 
 #### Changes
-* Reading snapshot archives requires increased `memlock` limits - recommended setting is `LimitMEMLOCK=2000000000` in systemd service configuration. Lack of sufficient limit will result slower startup times.
+* `--transaction-structure view` is now the default.
+* The default full snapshot interval is now 100,000 slots.
 
 ## 2.3.0