Merge branch 'dev' into switch-statement-700

Co-authored-by: Bronek Kozicki <brok@incorrekt.com>
Co-authored-by: Niq Dudfield <ndudfield@gmail.com>

.github/workflows/xahau-ga-nix.yml

@@ -230,6 +230,9 @@ jobs:
   build:
     needs: matrix-setup
     runs-on: ${{ fromJSON(matrix.runs_on) }}
+    permissions:
+      id-token: write
+      contents: read
     container:
       image: ubuntu:24.04
       volumes:
@@ -332,7 +335,7 @@ jobs:
           # Install gcovr for coverage jobs
           if [ "${{ matrix.job_type }}" = "coverage" ]; then
             pipx install "gcovr>=7,<9"
-            apt-get install -y lcov
+            apt-get install -y curl lcov
           fi
 
       - name: Check environment
@@ -407,7 +410,8 @@ jobs:
           cache_version: ${{ env.CACHE_VERSION }}
           main_branch: ${{ env.MAIN_BRANCH_NAME }}
           stdlib: ${{ matrix.stdlib }}
-          cmake-args: '-Dcoverage=ON -Dcoverage_format=xml -DCODE_COVERAGE_VERBOSE=ON -DCMAKE_CXX_FLAGS="-O0" -DCMAKE_C_FLAGS="-O0"'
+          # Coverage builds are slower due to instrumentation; use fewer parallel jobs to avoid flakiness
+          cmake-args: '-Dcoverage=ON -Dcoverage_format=xml -Dcoverage_test_parallelism=$(($(nproc)/2)) -DCODE_COVERAGE_VERBOSE=ON -DCMAKE_CXX_FLAGS="-O0" -DCMAKE_C_FLAGS="-O0"'
           cmake-target: 'coverage'
           ccache_max_size: '100G'
 
@@ -452,15 +456,11 @@ jobs:
 
       - name: Upload coverage report
         if: matrix.job_type == 'coverage'
-        uses: wandalen/wretry.action/main@v3
+        uses: codecov/codecov-action@v5
         with:
-          action: codecov/codecov-action@v4.3.0
+          files: coverage.xml
-          with: |
+          fail_ci_if_error: true
-            files: coverage.xml
+          disable_search: true
-            fail_ci_if_error: true
+          verbose: true
-            disable_search: true
+          plugins: noop
-            verbose: true
+          use_oidc: true
-            plugin: noop
-            token: ${{ secrets.CODECOV_TOKEN }}
-          attempt_limit: 5
-          attempt_delay: 210000 # in milliseconds

src/test/app/XahauGenesis_test.cpp

@@ -140,8 +140,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         bool skipTests = false,
         bool const testFlag = false,
         bool const badNetID = false,
-        uint32_t const expectedOwnerCount =
+        uint32_t const expectedOwnerCount = 14 /** case for testFlag=false */)
-            10 /** testFlag ? 10 : 14 (default) */)
     {
         using namespace jtx;
 
@@ -250,9 +249,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
             genesisAccRoot->getFieldAmount(sfBalance) ==
             XahauGenesis::GenesisAmount);
         BEAST_EXPECT(
-            genesisAccRoot->getFieldU32(sfOwnerCount) == !testFlag
+            genesisAccRoot->getFieldU32(sfOwnerCount) == expectedOwnerCount);
-                ? expectedOwnerCount
-                : 14);
 
         // ensure the definitions are correctly set
         {
@@ -595,7 +592,8 @@ struct XahauGenesis_test : public beast::unit_test::suite
             false,
             true,
             {},
-            3 /* IRR,IRD,IMC */ + members.size() + tables.size());
+            2 /*Hook objects *2 */ + 3 /* IRR,IRD,IMC HookStates */ +
+                members.size());
 
         env.close();
         env.close();
@@ -2327,7 +2325,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
             {
                 BEAST_EXPECT(
                     root->getFieldU32(sfOwnerCount) ==
-                    mc * 2 + 2 + paramsCount);
+                    (mc * 2 + 2 + paramsCount));
                 BEAST_EXPECT(root->getFieldU32(sfFlags) & lsfDisableMaster);
                 BEAST_EXPECT(root->getAccountID(sfRegularKey) == noAccount());
             }

src/xrpld/app/hook/detail/applyHook.cpp

@@ -2730,26 +2730,23 @@ DEFINE_HOOK_FUNCTION(
 
                 return serialize_keylet(kl, memory, write_ptr, write_len);
             }
+            // These keylet types are not yet implemented. Their
+            // corresponding amendments are not yet supported on the
+            // network. Each case needs a full implementation (see
+            // above cases for reference) before its amendment can be
+            // enabled.
+            // featureXChainBridge
             case keylet_code::BRIDGE:
             case keylet_code::XCHAIN_OWNED_CLAIM_ID:
-            case keylet_code::XCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID: {
+            case keylet_code::XCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID:
-                if (!applyCtx.view().rules().enabled(featureXChainBridge))
+            // featureMPTokensV1
-                    return INVALID_ARGUMENT;
-            }
             case keylet_code::MPTOKEN_ISSUANCE:
-            case keylet_code::MPTOKEN: {
+            case keylet_code::MPTOKEN:
-                if (!applyCtx.view().rules().enabled(featureMPTokensV1))
+            // featureCredentials
-                    return INVALID_ARGUMENT;
+            case keylet_code::CREDENTIAL:
-            }
+            // featurePermissionedDomains
-            case keylet_code::CREDENTIAL: {
+            case keylet_code::PERMISSIONED_DOMAIN:
-                if (!applyCtx.view().rules().enabled(featureCredentials))
+                return INVALID_ARGUMENT;
-                    return INVALID_ARGUMENT;
-            }
-            case keylet_code::PERMISSIONED_DOMAIN: {
-                if (!applyCtx.view().rules().enabled(
-                        featurePermissionedDomains))
-                    return INVALID_ARGUMENT;
-            }
         }
     }
     catch (std::exception& e)