Merge branch 'master' into ak/discriminator

.config/nextest.toml

@@ -1,5 +1,5 @@
 [profile.default]
-retries = { backoff = "exponential", count = 5, delay = "1s", jitter = true, max-delay = "10s" }
+# retries = { backoff = "exponential", count = 3, delay = "10ms", jitter = true, max-delay = "100ms" }
 test-threads = "num-cpus"
 threads-required = 1
 fail-fast = false

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
         uses: baptiste0928/cargo-install@v3
         with:
           crate: cargo-audit
-      - run: cargo audit --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2023-0065 --ignore RUSTSEC-2024-0344
+      - run: cargo audit --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2023-0065 --ignore RUSTSEC-2024-0344 --ignore RUSTSEC-2024-0421
 
   code_gen:
     name: code generation
@@ -85,7 +85,8 @@ jobs:
           crate: cargo-sort
       - run: cargo sort --workspace --check
       - run: cargo fmt --all --check
-      - run: cargo clippy --all-features -- -D warnings -D clippy::all -D clippy::nursery -D clippy::integer_division -D clippy::arithmetic_side_effects -D clippy::style -D clippy::perf
+      - run: |
+          cargo clippy --all-features -- -D warnings -D clippy::all -D clippy::nursery -D clippy::integer_division -D clippy::arithmetic_side_effects -D clippy::style -D clippy::perf
 
   build:
     name: build
@@ -105,11 +106,12 @@ jobs:
         run: cargo-build-sbf
         env:
           TIP_ROUTER_PROGRAM_ID: ${{ env.TIP_ROUTER_PROGRAM_ID }}
+          SBF_OUT_DIR: ${{ github.workspace }}/target/sbf-solana-solana/release
       - name: Upload MEV Tip Distribution NCN program
         uses: actions/upload-artifact@v4
         with:
           name: jito_tip_router_program.so
-          path: target/sbf-solana-solana/release/jito_tip_router_program.so
+          path: target/sbf-solana-solana/release/
           if-no-files-found: error
 
   # coverage:
@@ -150,11 +152,13 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: jito_tip_router_program.so
-          path: target/sbf-solana-solana/release/
+          path: integration_tests/tests/fixtures/
       - uses: taiki-e/install-action@nextest
-      - run: cargo nextest run --all-features
+      # Test the non-BPF tests and the BPF tests separately
+      - run: cargo nextest run --all-features -E 'not test(bpf)'
+      - run: cargo nextest run --all-features -E 'test(bpf)'
         env:
-          SBF_OUT_DIR: ${{ github.workspace }}/target/sbf-solana-solana/release
+          SBF_OUT_DIR: ${{ github.workspace }}/integration_tests/tests/fixtures
 
   # create_release:
   #   name: Create Release

.gitignore

@@ -1,4 +1,9 @@
 /target
 
 .developer
-node_modules
+node_modules
+
+# Debugging
+program_errors.json
+test_errors.output
+tests.output