Merge branch 'master' into rpc-test-invoke

Author: Shaptic

.github/codeql/codeql-config.yml

@@ -0,0 +1,36 @@
+name: "Stellar Core CodeQL Config"
+
+# Restrict CodeQL analysis to production code only.
+# See: https://docs.github.com/en/code-security/reference/code-scanning/workflow-configuration-options#specifying-directories-to-scan
+#
+# `paths` lists the directories that should be scanned. For compiled languages
+# (C/C++) `paths` is advisory: CodeQL still analyzes everything that gets built,
+# but `paths-ignore` is honored to filter results.
+
+paths:
+  - .github/workflows
+  - src
+
+paths-ignore:
+  # Test directories and test data anywhere under src
+  - src/**/test
+  - src/**/testdata
+  # Simulation is a non-production test/benchmarking subsystem
+  - src/simulation
+  # Generated XDR bindings
+  - src/xdr
+  # No skipping vendored / third-party libraries for now
+  # - lib
+  # Rust vendored soroban sources (tests + fuzz harnesses)
+  - src/rust/soroban/**/fuzz
+  # Build, tooling and docs
+  - docker
+  - docs
+  - scripts
+  - performance-eval
+  - Builds
+  - m4
+  - target
+  - test-lcm
+  - test-tx-meta-baseline-current
+  - test-tx-meta-baseline-next

.github/copilot-instructions.md

@@ -48,6 +48,17 @@ $ ./src/stellar-core test --ll fatal -r simple --abort --disable-dots "[tag]"
 $ NUM_PARTITIONS=$(nproc) STELLAR_CORE_TEST_PARAMS='--ll fatal -r simple --abort --disable-dots' make check
 ```
 
+When you make a protocol change
+(including `#ifdef`-gated vnext code) and add tests for that change, you MUST regenerate the captured
+`LedgerCloseMeta` golden data and commit the resulting `test-lcm/` changes.
+For vnext tests, configure with
+`--enable-next-protocol-version-unsafe-for-production` and rebuild first.
+
+```sh
+# regenerate captured LedgerCloseMeta golden data, then commit test-lcm/
+$ ./src/stellar-core test --ll fatal -r simple --abort --disable-dots --rng-seed 12345 --capture-lcm "[tx]"
+```
+
 
 ## Tools, subagents and skills
 

.github/workflows/build.yml

@@ -76,7 +76,7 @@ jobs:
         if: steps.check-last-tested-commit.outputs.skip != 'true'
         # Prevent sudden announcement of a new advisory from failing ci:
         continue-on-error: true
-        uses: EmbarkStudios/cargo-deny-action@8d73959fce1cdc8989f23fdf03bec6ae6a6576ef
+        uses: EmbarkStudios/cargo-deny-action@91bf2b620e09e18d6eb78b92e7861937469acedb # v2.0.17
         with:
           command: check advisories
           # leave arguments empty so we don't test --all-features
@@ -85,7 +85,7 @@ jobs:
 
       - name: Check cargo-deny bans licenses sources
         if: steps.check-last-tested-commit.outputs.skip != 'true'
-        uses: EmbarkStudios/cargo-deny-action@8d73959fce1cdc8989f23fdf03bec6ae6a6576ef
+        uses: EmbarkStudios/cargo-deny-action@91bf2b620e09e18d6eb78b92e7861937469acedb # v2.0.17
         with:
           command: check bans licenses sources
           # leave arguments empty so we don't test --all-features

.github/workflows/codeql.yml

@@ -0,0 +1,73 @@
+name: CodeQL
+
+on:
+  schedule:
+    # Run weekly on Monday at 06:00 UTC
+    - cron: '0 6 * * 1'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  security-events: write
+  actions: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: c-cpp
+            build-mode: autobuild
+          - language: rust
+            build-mode: none
+          - language: python
+            build-mode: none
+          - language: actions
+            build-mode: none
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 1
+
+      - name: Install build dependencies
+        if: matrix.language == 'c-cpp'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            git build-essential pkg-config autoconf automake libtool \
+            bison flex libpq-dev libunwind-dev parallel sed perl \
+            postgresql ccache clang-format-12 libc++-dev libc++abi-dev
+
+      - name: Install Rust toolchain
+        if: matrix.language == 'c-cpp' || matrix.language == 'rust'
+        run: ./install-rust.sh
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          config-file: ./.github/codeql/codeql-config.yml
+
+      - name: Configure
+        if: matrix.language == 'c-cpp'
+        run: |
+          ./autogen.sh
+          ./configure --enable-ccache --enable-sdfprefs
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{ matrix.language }}"

.gitignore

@@ -66,6 +66,7 @@ compile_commands.json
 /autom4te.cache
 /build
 /src/stellar-core
+/src/fuzz_*
 /buckets
 /compile
 /config.h

.gitmodules

@@ -23,14 +23,10 @@
 	path = lib/spdlog
 	url = https://github.com/gabime/spdlog
 	ignore = dirty
-[submodule "src/protocol-next/xdr"]
-	path = src/protocol-next/xdr
-	url = https://github.com/stellar/stellar-xdr
-	branch = next
 [submodule "src/protocol-curr/xdr"]
 	path = src/protocol-curr/xdr
 	url = https://github.com/stellar/stellar-xdr
-	branch = curr
+	branch = main
 [submodule "src/rust/soroban/p21"]
 	path = src/rust/soroban/p21
 	url = https://github.com/stellar/rs-soroban-env
@@ -50,6 +46,9 @@
 [submodule "src/rust/soroban/p26"]
 	path = src/rust/soroban/p26
 	url = https://github.com/stellar/rs-soroban-env.git
+[submodule "src/rust/soroban/p27"]
+	path = src/rust/soroban/p27
+	url = https://github.com/stellar/rs-soroban-env.git
 [submodule "lib/gperftools"]
 	path = lib/gperftools
 	url = https://github.com/gperftools/gperftools.git

Builds/VisualStudio/build_rust.bat

@@ -5,12 +5,12 @@
 set "project_dir=%~dp0..\.."
 set "toolchain_file=%project_dir%\rust-toolchain.toml"
 set "out_dir=%1\rust"
-set features=
+set "host_features="
+set "core_features="
 set release_profile=
 set "set_linker_flags=cd ."
 if "%2"=="debug" set "set_linker_flags=(set CFLAGS=-MDd) & (set CXXFLAGS=-MDd)"
 if "%2"=="release" set "release_profile=--release"
-if "%3"=="next" set "features=--features next"
 
 if not exist "%toolchain_file%" (
     echo Error: "%toolchain_file%" not found.
@@ -35,7 +35,15 @@ rem -- range to use for stable host envs
 set MIN_P=21
 set MAX_P=26
 rem -- version of the latest WIP protocol
-set LATEST_P=26
+set LATEST_P=27
+rem -- source host used to build the latest protocol. When this differs from
+rem -- LATEST_P, the latest build reuses an older host with --features next.
+set LATEST_HOST_P=27
+
+if "%3"=="next" (
+    set "core_features=--features next"
+    if not "%LATEST_HOST_P%"=="%LATEST_P%" set "host_features=--features next"
+)
 
 rem ---- Accumulators for final rustc link flags ----
 set "EXTERNS="
@@ -67,7 +75,7 @@ for /l %%P in (%MIN_P%,1,%MAX_P%) do (
 
     rem -- Decide whether to skip building this protocol in the loop --
     set "skip_build="
-    if defined features if %%P==%LATEST_P% set "skip_build=1"
+    if "%3"=="next" if %%P==%LATEST_P% set "skip_build=1"
 
     if not defined skip_build (
         if defined stamp_ok (
@@ -83,15 +91,16 @@ for /l %%P in (%MIN_P%,1,%MAX_P%) do (
         )
     )
 
-  if not defined skip_build (
-    set "EXTERNS=!EXTERNS! --extern soroban_env_host_p%%P=%out_dir%\soroban-p%%P-target\%2\libsoroban_env_host.rlib"
-    set "LPATHS=!LPATHS! -L dependency=%out_dir%\soroban-p%%P-target\%2\deps"
-  )
+    if not defined skip_build (
+        set "EXTERNS=!EXTERNS! --extern soroban_env_host_p%%P=%out_dir%\soroban-p%%P-target\%2\libsoroban_env_host.rlib"
+        set "LPATHS=!LPATHS! -L dependency=%out_dir%\soroban-p%%P-target\%2\deps"
+    )
 )
 
-rem ---- Build LATEST_P with features (only when "next" is passed) ----
-if defined features (
-    set "latest_proto_dir=%project_dir%\src\rust\soroban\p%LATEST_P%"
+rem ---- Build LATEST_P for next builds. If LATEST_HOST_P differs from LATEST_P,
+rem ---- the latest build reuses that host source with --features next. ----
+if "%3"=="next" (
+    set "latest_proto_dir=%project_dir%\src\rust\soroban\p%LATEST_HOST_P%"
     set "latest_proto_target=%out_dir%\soroban-p%LATEST_P%-target"
 
     set "latest_rev="
@@ -109,8 +118,8 @@ if defined features (
     if defined latest_stamp_ok (
         echo p%LATEST_P% ^(latest^): up to date, skipping.
     ) else (
-        echo p%LATEST_P% ^(latest^): building soroban-env-host with %features%...
-        %set_linker_flags% & pushd "!latest_proto_dir!" & (set RUSTFLAGS=-Cmetadata=p%LATEST_P%-!latest_rev:~0,12!) & cargo +%version% build %release_profile% --package soroban-env-host --locked %features% --target-dir "!latest_proto_target!" & popd
+        echo p%LATEST_P% ^(latest^): building soroban-env-host with %host_features%...
+        %set_linker_flags% & pushd "!latest_proto_dir!" & (set RUSTFLAGS=-Cmetadata=p%LATEST_P%-!latest_rev:~0,12!) & cargo +%version% build %release_profile% --package soroban-env-host --locked %host_features% --target-dir "!latest_proto_target!" & popd
         if errorlevel 1 exit /b 1
         if not "!latest_rev!"=="" (
             if not exist "!latest_proto_target!" mkdir "!latest_proto_target!"
@@ -147,7 +156,8 @@ rem Always invoke cargo here: cargo's own incremental-build tracking will
 rem no-op quickly when nothing changed, and the .soroban-revs file
 rem (tracked via build.rs) forces a rebuild when submodules change.
 echo Building stellar-core Rust library...
-%set_linker_flags% & cd /d "%project_dir%" & cargo +%version% rustc %release_profile% --package stellar-core --locked %features% --target-dir "%out_dir%\target" -- %EXTERNS% %LPATHS%
+echo Build command: cargo +%version% rustc %release_profile% --package stellar-core --locked %core_features% --target-dir "%out_dir%\target" -- %EXTERNS% %LPATHS%
+%set_linker_flags% & cd /d "%project_dir%" & cargo +%version% rustc %release_profile% --package stellar-core --locked %core_features% --target-dir "%out_dir%\target" -- %EXTERNS% %LPATHS%
 
 endlocal