Merge branch 'dev' into HookAdministrator

This reverts commit 5c1d7d9ae9.

build-core.sh

@@ -55,8 +55,10 @@ sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abb
 conan export external/snappy --version 1.1.10 --user xahaud --channel stable &&
 conan export external/soci --version 4.0.3 --user xahaud --channel stable &&
 cd release-build &&
-# Install dependencies. The Conan profile tags package_ids with the glibc
-# baseline, so tools like b2/protoc are built locally instead of downloaded.
+# Install dependencies - tool_requires in conanfile.py handles glibc 2.28 compatibility
+# for build tools (protoc, grpc plugins, b2) in HBB environment
+# The tool_requires('b2/5.3.2') in conanfile.py should force b2 to build from source
+# with the correct toolchain, avoiding the GLIBCXX_3.4.29 issue
 echo "=== Installing dependencies ===" &&
 conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE \
   -o with_wasmedge=False -o tool_requires_b2=True &&
@@ -76,10 +78,8 @@ strip -s rippled &&
 mv rippled xahaud &&
 echo "=== Full ldd output ===" &&
 ldd xahaud &&
-echo "=== Checking GLIBC requirement (must be <= 2.28) ===" &&
-GLIBC_MAX=$(objdump -T xahaud | grep -o 'GLIBC_[0-9.]*' | sort -uV | tail -1) &&
-echo "Max required: $GLIBC_MAX" &&
-[ "$(printf '%s\n' GLIBC_2.28 "$GLIBC_MAX" | sort -V | tail -1)" = "GLIBC_2.28" ] &&
+echo "=== Running libcheck ===" &&
+libcheck xahaud &&
 echo "Build host: `hostname`" > release.info &&
 echo "Build date: `date`" >> release.info &&
 echo "Build md5: `md5sum xahaud`" >> release.info &&
@@ -88,11 +88,9 @@ git remote -v >> release.info &&
 echo "Git status:" >> release.info &&
 git status -v >> release.info &&
 echo "Git log [last 20]:" >> release.info &&
-git log -n 20 >> release.info || BUILD_FAILED=1
+git log -n 20 >> release.info;
 
-if [[ -n "${BUILD_FAILED:-}" ]]; then
-  echo "ERR build failed, not publishing"
-elif [[ "$4" == "" ]]; then
+if [[ "$4" == "" ]]; then
   # Non GH, local building
   echo "Non GH, local building, no Action runner magic"
 else
@@ -111,7 +109,7 @@ else
   echo $(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)+$4
 fi
 
-cd /io;
+cd ..;
 
 mv src/xrpld/net/detail/RegisterSSLCerts.cpp.old src/xrpld/net/detail/RegisterSSLCerts.cpp;
 mv cmake/deps/WasmEdge.old cmake/deps/WasmEdge.cmake;
@@ -119,5 +117,3 @@ rm src/certs/certbundle.h;
 git checkout src/libxrpl/protocol/BuildInfo.cpp;
 
 echo "END INSIDE CONTAINER - CORE"
-
-[[ -z "${BUILD_FAILED:-}" ]] || exit 1

build-full.sh

@@ -64,7 +64,7 @@ if [ "$(grep certbundle.h src/xrpld/net/detail/RegisterSSLCerts.cpp | wc -l)" -e
     sed -i "s/#include <xrpld\/net\/RegisterSSLCerts.h>/\0\n#include <certs\/certbundle.h>/g" src/xrpld/net/detail/RegisterSSLCerts.cpp
 fi
 # Environment setup moved to Dockerfile in release-builder.sh
-source /opt/rh/gcc-toolset-13/enable
+source /opt/rh/gcc-toolset-11/enable
 export PATH=/usr/local/bin:$PATH
 export CC='/usr/lib64/ccache/gcc' &&
   export CXX='/usr/lib64/ccache/g++' &&

hook/sfcodes.h

@@ -243,6 +243,7 @@
 #define sfLockingChainDoor ((8U << 16U) + 22U)
 #define sfIssuingChainDoor ((8U << 16U) + 23U)
 #define sfSubject ((8U << 16U) + 24U)
+#define sfHookAdministrator ((8U << 16U) + 98U)
 #define sfInform ((8U << 16U) + 99U)
 #define sfIndexes ((19U << 16U) + 1U)
 #define sfHashes ((19U << 16U) + 2U)

hook/tx_flags.h

@@ -100,6 +100,10 @@ enum NFTokenCreateOfferFlags : uint32_t {
     tfSellNFToken = 0x00000001,
 };
 
+enum SetHookFlags : uint32_t {
+    tfNewAccount = 0x00000001,
+};
+
 enum ClaimRewardFlags : uint32_t {
     tfOptOut = 0x00000001,
 };

include/xrpl/protocol/TxFlags.h

@@ -223,6 +223,11 @@ constexpr std::uint32_t const tfNFTokenCancelOfferMask     = ~tfUniversal;
 // NFTokenAcceptOffer flags:
 constexpr std::uint32_t const tfNFTokenAcceptOfferMask     = ~tfUniversal;
 
+enum SetHookFlags : uint32_t {
+    tfNewAccount = 0x00000001,
+};
+constexpr std::uint32_t const tfSetHookMask = ~(tfUniversal | tfNewAccount);
+
 // URIToken mask
 constexpr std::uint32_t const tfURITokenMintMask = ~(tfUniversal | tfBurnable);
 constexpr std::uint32_t const tfURITokenNonMintMask = ~tfUniversal;

include/xrpl/protocol/detail/features.macro

@@ -34,6 +34,7 @@
 // If you add an amendment here, then do not forget to increment `numFeatures`
 // in include/xrpl/protocol/Feature.h.
 
+XRPL_FEATURE(HookAdministrator,          Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(OnChainManifests,           Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (HookMap,                    Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (GuardDepth32,               Supported::yes, VoteBehavior::DefaultNo)

include/xrpl/protocol/detail/ledger_entries.macro

@@ -262,6 +262,7 @@ LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
     {sfHookStateScale,       soeOPTIONAL},
     {sfCron,                 soeOPTIONAL},
     {sfAMMID,                soeOPTIONAL},
+    {sfHookAdministrator,    soeOPTIONAL},
     {sfManifestID,           soeOPTIONAL},
 }))
 

include/xrpl/protocol/detail/sfields.macro

@@ -320,6 +320,7 @@ TYPED_SFIELD(sfAttestationRewardAccount, ACCOUNT,   21)
 TYPED_SFIELD(sfLockingChainDoor,         ACCOUNT,   22)
 TYPED_SFIELD(sfIssuingChainDoor,         ACCOUNT,   23)
 TYPED_SFIELD(sfSubject,                  ACCOUNT,   24)
+TYPED_SFIELD(sfHookAdministrator,        ACCOUNT,   98)
 TYPED_SFIELD(sfInform,                   ACCOUNT,   99)
 
 // vector of 256-bit

include/xrpl/protocol/detail/transactions.macro

@@ -195,6 +195,7 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete, ({
 /** This transaction type installs a hook. */
 TRANSACTION(ttHOOK_SET, 22, SetHook, ({
     {sfHooks, soeREQUIRED},
+    {sfDestination, soeOPTIONAL},
 }))
 
 /** This transaction mints a new NFT. */

include/xrpl/protocol/jss.h

@@ -292,9 +292,7 @@ JSS(duration_us);             // out: NetworkOPs
 JSS(effective);               // out: ValidatorList
                               // in: UNL
 JSS(elapsed_seconds);
-JSS(enabled);                // out: AmendmentTable (on-ledger);
-                             //      ServerDefinitions (this server)
-JSS(ledger_enabled);         // out: ServerDefinitions (on-ledger)
+JSS(enabled);                // out: AmendmentTable
 JSS(engine_result);          // out: NetworkOPs, TransactionSign, Submit
 JSS(engine_result_code);     // out: NetworkOPs, TransactionSign, Submit
 JSS(engine_result_message);  // out: NetworkOPs, TransactionSign, Submit

release-builder.sh

@@ -12,12 +12,10 @@ echo "Cleaning previously built binary"
 rm -f release-build/xahaud
 
 BUILD_CORES=$(echo "scale=0 ; $(nproc) / 1.337" | bc)
-OUT_DIR="/data/builds"
 
 if [[ "$GITHUB_REPOSITORY" == "" ]]; then
   #Default
   BUILD_CORES=${BUILD_CORES:-8}
-  OUT_DIR="./data/builds"
 fi
 
 # Ensure still works outside of GH Actions by setting these to /dev/null
@@ -53,7 +51,7 @@ CACHE_VOLUME_NAME="xahau-release-builder-cache"
 if false; then
   echo "Static container, execute in static container to have max. cache"
   docker start $CONTAINER_NAME
-  docker exec -i $CONTAINER_NAME bash -c "source /opt/rh/gcc-toolset-13/enable && bash -x /io/build-core.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
+  docker exec -i $CONTAINER_NAME /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && bash -x /io/build-core.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
   docker stop $CONTAINER_NAME
 else
   echo "No static container, build on temp container"
@@ -65,29 +63,24 @@ else
   # Create inline Dockerfile with environment setup for build-full.sh
   DOCKERFILE_CONTENT=$(
     cat <<'DOCKERFILE_EOF'
-FROM --platform=linux/amd64 almalinux:8
+FROM ghcr.io/phusion/holy-build-box:4.0.1-amd64
 
 ARG BUILD_CORES=8
 
-# AlmaLinux 8 keeps the glibc 2.28 baseline (same as holy-build-box 4).
-# The devel repo (disabled by default, like in holy-build-box) provides ncurses-static.
-# gcc-toolset-13 builds everything: Boost/LLD/WasmEdge below, Conan deps and xahaud.
-RUN dnf install -y dnf-plugins-core epel-release && \
-    dnf config-manager --set-enabled powertools && \
-    printf "%s\n" "[devel]" "name=AlmaLinux 8 - Devel" \
-        "baseurl=https://repo.almalinux.org/almalinux/8/devel/\$basearch/os/" \
-        "gpgcheck=1" "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux" "enabled=0" \
-        > /etc/yum.repos.d/almalinux-devel.repo && \
+# Enable repositories and install dependencies
+RUN /hbb_exe/activate-exec bash -c "dnf install -y epel-release && \
+    dnf config-manager --set-enabled powertools || dnf config-manager --set-enabled crb && \
     dnf install -y --enablerepo=devel \
-        wget git unzip xz perl hostname make \
-        gcc-toolset-13-gcc-c++ gcc-toolset-13-binutils gcc-toolset-13-libatomic-devel \
+        wget git \
+        gcc-toolset-11-gcc-c++ gcc-toolset-11-binutils gcc-toolset-11-libatomic-devel \
         lz4 lz4-devel \
         ncurses-static ncurses-devel \
         snappy snappy-devel \
         zlib zlib-devel zlib-static \
-        sqlite-devel \
-        python3.11 python3.11-pip \
+        libasan \
+        python3 python3-pip \
         ccache \
+        ninja-build \
         mold \
         patch \
         glibc-devel glibc-static \
@@ -97,15 +90,16 @@ RUN dnf install -y dnf-plugins-core epel-release && \
         texinfo \
         libtool \
         llvm14-static llvm14-devel && \
-    dnf clean all
+    dnf clean all"
 
 # Install Conan 2 and CMake
-RUN python3.11 -m pip install "conan>=2.0,<3.0" "ninja>=1.13,<1.14" && \
-    wget -q https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz -O cmake.tar.gz && \
-    tar -xzf cmake.tar.gz --strip-components=1 -C /usr/local && \
+RUN /hbb_exe/activate-exec pip3 install "conan>=2.0,<3.0" && \
+    /hbb_exe/activate-exec wget -q https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz -O cmake.tar.gz && \
+    mkdir cmake && \
+    tar -xzf cmake.tar.gz --strip-components=1 -C cmake && \
     rm cmake.tar.gz
 
-# Dual Boost configuration:
+# Dual Boost configuration in HBB environment:
 # - Manual Boost in /usr/local (minimal: for WasmEdge which is pre-built in Docker)
 # - Conan Boost (full: for the application and all dependencies via toolchain)
 #
@@ -115,8 +109,7 @@ RUN python3.11 -m pip install "conan>=2.0,<3.0" "ninja>=1.13,<1.14" && \
 #   - link=static: Creates static Boost libraries (.a files) instead of shared (.so files)
 #   - runtime-link=shared: Links Boost libraries against shared libc (glibc)
 # WasmEdge only needs boost::filesystem and boost::system
-RUN echo 'Boost cache bust: v5-minimal' && \
-    source /opt/rh/gcc-toolset-13/enable && \
+RUN /hbb_exe/activate-exec bash -c "echo 'Boost cache bust: v5-minimal' && \
     rm -rf /usr/local/lib/libboost* /usr/local/include/boost && \
     cd /tmp && \
     wget -q https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.gz -O boost.tar.gz && \
@@ -128,7 +121,7 @@ RUN echo 'Boost cache bust: v5-minimal' && \
         link=static runtime-link=shared -j${BUILD_CORES} \
         --with-filesystem --with-system && \
     cd /tmp && \
-    rm -rf boost boost.tar.gz
+    rm -rf boost boost.tar.gz"
 
 ENV CMAKE_EXE_LINKER_FLAGS="-static-libstdc++"
 
@@ -138,10 +131,8 @@ ENV WasmEdge_LIB=/usr/local/lib64/libwasmedge.a
 ENV CC='ccache gcc'
 ENV CXX='ccache g++'
 
-# LLVM 14 headers rely on <cstdint> being included transitively, which gcc 13 no longer does
 # Install LLD
-RUN source /opt/rh/gcc-toolset-13/enable && \
-    export CXXFLAGS="-include cstdint" && \
+RUN /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
     cd /tmp && \
     wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.3/lld-14.0.3.src.tar.xz && \
     wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.3/libunwind-14.0.3.src.tar.xz && \
@@ -154,11 +145,11 @@ RUN source /opt/rh/gcc-toolset-13/enable && \
         -DLLVM_LIBRARY_DIR=/usr/lib64/llvm14/lib/ \
         -DCMAKE_INSTALL_PREFIX=/usr/lib64/llvm14/ \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS" && \
+        -DCMAKE_EXE_LINKER_FLAGS=\"\$CMAKE_EXE_LINKER_FLAGS\" && \
     make -j${BUILD_CORES} install && \
     ln -s /usr/lib64/llvm14/lib/include/lld /usr/include/lld && \
     cp /usr/lib64/llvm14/lib/liblld*.a /usr/local/lib/ && \
-    cd /tmp && rm -rf lld-* libunwind-*
+    cd /tmp && rm -rf lld-* libunwind-*"
 
 # Build and install WasmEdge (static version)
 # Note: Conan only provides WasmEdge with shared library linking.
@@ -170,14 +161,11 @@ RUN source /opt/rh/gcc-toolset-13/enable && \
 RUN cd /tmp && \
     ( wget -nc -q https://github.com/WasmEdge/WasmEdge/archive/refs/tags/0.11.2.zip; unzip -o 0.11.2.zip; ) && \
     cd WasmEdge-0.11.2 && \
-    sed -i "/^ *-Werror$/d" cmake/Helper.cmake && \
-    sed -i "s/\[\[noreturn\]\] inline void Fault::emitFault/[[noreturn]] void Fault::emitFault/" lib/system/fault.cpp && \
     ( mkdir -p build; echo "" ) && \
     cd build && \
-    source /opt/rh/gcc-toolset-13/enable && \
-    export CXXFLAGS="-include cstdint" && \
-    ln -sf /opt/rh/gcc-toolset-13/root/usr/bin/ar /usr/bin/ar && \
-    ln -sf /opt/rh/gcc-toolset-13/root/usr/bin/ranlib /usr/bin/ranlib && \
+    /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && \
+    ln -sf /opt/rh/gcc-toolset-11/root/usr/bin/ar /usr/bin/ar && \
+    ln -sf /opt/rh/gcc-toolset-11/root/usr/bin/ranlib /usr/bin/ranlib && \
     echo '=== Binutils version check ===' && \
     ar --version | head -1 && \
     ranlib --version | head -1 && \
@@ -193,9 +181,9 @@ RUN cd /tmp && \
         -DWASMEDGE_BUILD_PLUGINS=OFF \
         -DWASMEDGE_LINK_TOOLS_STATIC=ON \
         -DBoost_NO_BOOST_CMAKE=ON \
-        -DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS" \
+        -DCMAKE_EXE_LINKER_FLAGS=\"\$CMAKE_EXE_LINKER_FLAGS\" \
         && \
-    make -j${BUILD_CORES} install && \
+    make -j${BUILD_CORES} install" && \
     cp -r include/api/wasmedge /usr/include/ && \
     cd /tmp && rm -rf WasmEdge* 0.11.2.zip
 
@@ -204,7 +192,7 @@ ENV PATH=/usr/local/bin:$PATH
 
 # Configure ccache and Conan 2
 # NOTE: Using echo commands instead of heredocs because heredocs in Docker RUN commands are finnicky
-RUN ccache -M 100G && \
+RUN /hbb_exe/activate-exec bash -c "ccache -M 100G && \
     ccache -o cache_dir=/cache/ccache && \
     ccache -o compiler_check=content && \
     ccache -o direct_mode=true && \
@@ -219,23 +207,14 @@ RUN ccache -M 100G && \
     echo 'compiler=gcc' >> ~/.conan2/profiles/default && \
     echo 'compiler.cppstd=20' >> ~/.conan2/profiles/default && \
     echo 'compiler.libcxx=libstdc++11' >> ~/.conan2/profiles/default && \
-    echo 'compiler.version=13' >> ~/.conan2/profiles/default && \
+    echo 'compiler.version=11' >> ~/.conan2/profiles/default && \
     echo 'os=Linux' >> ~/.conan2/profiles/default && \
     echo '' >> ~/.conan2/profiles/default && \
     echo '[conf]' >> ~/.conan2/profiles/default && \
     echo '# Force building from source for packages with binary compatibility issues' >> ~/.conan2/profiles/default && \
     echo '*:tools.system.package_manager:mode=build' >> ~/.conan2/profiles/default && \
-    echo '# Tag every package_id with the glibc baseline so ConanCenter binaries (built on a' >> ~/.conan2/profiles/default && \
-    echo '# newer glibc, e.g. protoc/b2) never match; everything is built locally and cached' >> ~/.conan2/profiles/default && \
-    echo 'user.xahaud:glibc=2.28' >> ~/.conan2/profiles/default && \
-    echo 'tools.info.package_id:confs=["user.xahaud:glibc"]' >> ~/.conan2/profiles/default && \
-    echo "" >> ~/.conan2/profiles/default && \
-    echo "# ninja is provided by pip (manylinux wheel); building it in Conan hits a gcc-13 LTO ICE" >> ~/.conan2/profiles/default && \
-    echo "[platform_tool_requires]" >> ~/.conan2/profiles/default && \
-    echo "ninja/1.13.2" >> ~/.conan2/profiles/default && \
-    ln -sf ../../bin/ccache /usr/lib64/ccache/gcc && \
-    ln -sf ../../bin/ccache /usr/lib64/ccache/g++ && \
-    ln -sf ../../bin/ccache /usr/lib64/ccache/c++
+    ln -s ../../bin/ccache /usr/lib64/ccache/g++ && \
+    ln -s ../../bin/ccache /usr/lib64/ccache/c++"
 
 DOCKERFILE_EOF
   )
@@ -248,15 +227,15 @@ DOCKERFILE_EOF
   if [[ "$GITHUB_REPOSITORY" == "" ]]; then
     # Non GH, local building
     echo "Non-GH runner, local building, temp container"
-    docker run -i --user 0:$(id -g) --rm -v $OUT_DIR:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" bash -c "source /opt/rh/gcc-toolset-13/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
+    docker run -i --user 0:$(id -g) --rm -v /data/builds:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
   else
     # GH Action, runner
     echo "GH Action, runner, clean & re-create create persistent container"
     docker rm -f $CONTAINER_NAME
     echo "echo 'Stopping container: $CONTAINER_NAME'" >>"$JOB_CLEANUP_SCRIPT"
     echo "docker stop --time=15 \"$CONTAINER_NAME\" || echo 'Failed to stop container or container not running'" >>"$JOB_CLEANUP_SCRIPT"
-    docker run -di --user 0:$(id -g) --name $CONTAINER_NAME -v $OUT_DIR:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" bash
-    docker exec -i $CONTAINER_NAME bash -c "source /opt/rh/gcc-toolset-13/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
+    docker run -di --user 0:$(id -g) --name $CONTAINER_NAME -v /data/builds:/data/builds -v $(pwd):/io -v "$CACHE_VOLUME_NAME":/cache --network host "$IMAGE_NAME" /hbb_exe/activate-exec bash
+    docker exec -i $CONTAINER_NAME /hbb_exe/activate-exec bash -c "source /opt/rh/gcc-toolset-11/enable && bash -x /io/build-full.sh '$GITHUB_REPOSITORY' '$GITHUB_SHA' '$BUILD_CORES' '$GITHUB_RUN_NUMBER'"
     docker stop $CONTAINER_NAME
   fi
 fi

src/test/rpc/ServerDefinitions_test.cpp

@@ -163,7 +163,7 @@ public:
     void
     testNoParams(FeatureBitset features)
     {
-        testcase("Default Env: config-forced, none on-ledger");
+        testcase("No Params, None Enabled");
 
         using namespace test::jtx;
         Env env{*this};
@@ -178,6 +178,8 @@ public:
         {
             if (!BEAST_EXPECT(feature.isMember(jss::name)))
                 return;
+            // default config - so all should be disabled, and
+            // supported. Some may be vetoed.
             bool expectVeto =
                 (votes.at(feature[jss::name].asString()) ==
                  VoteBehavior::DefaultNo);
@@ -186,12 +188,8 @@ public:
                  VoteBehavior::Obsolete);
             BEAST_EXPECTS(
                 feature.isMember(jss::enabled) &&
-                    feature[jss::enabled].asBool(),
+                    !feature[jss::enabled].asBool(),
                 feature[jss::name].asString() + " enabled");
-            BEAST_EXPECTS(
-                feature.isMember(jss::ledger_enabled) &&
-                    !feature[jss::ledger_enabled].asBool(),
-                feature[jss::name].asString() + " ledger_enabled");
             BEAST_EXPECTS(
                 feature.isMember(jss::vetoed) &&
                     feature[jss::vetoed].isBool() == !expectObsolete &&
@@ -210,7 +208,7 @@ public:
     void
     testSomeEnabled(FeatureBitset features)
     {
-        testcase("Two config-forced, none on-ledger");
+        testcase("No Params, Some Enabled");
 
         using namespace test::jtx;
         Env env{
@@ -230,10 +228,7 @@ public:
             (void)id.parseHex(it.key().asString().c_str());
             if (!BEAST_EXPECT((*it).isMember(jss::name)))
                 return;
-            bool const expectOnLedger =
-                env.app().getAmendmentTable().isEnabled(id);
-            bool const expectForced =
-                id == featureDepositAuth || id == featureDepositPreauth;
+            bool expectEnabled = env.app().getAmendmentTable().isEnabled(id);
             bool expectSupported =
                 env.app().getAmendmentTable().isSupported(id);
             bool expectVeto =
@@ -244,14 +239,9 @@ public:
                  VoteBehavior::Obsolete);
             BEAST_EXPECTS(
                 (*it).isMember(jss::enabled) &&
-                    (*it)[jss::enabled].asBool() ==
-                        (expectOnLedger || expectForced),
+                    (*it)[jss::enabled].asBool() == expectEnabled,
                 (*it)[jss::name].asString() + " enabled");
-            BEAST_EXPECTS(
-                (*it).isMember(jss::ledger_enabled) &&
-                    (*it)[jss::ledger_enabled].asBool() == expectOnLedger,
-                (*it)[jss::name].asString() + " ledger_enabled");
-            if (expectOnLedger)
+            if (expectEnabled)
                 BEAST_EXPECTS(
                     !(*it).isMember(jss::vetoed),
                     (*it)[jss::name].asString() + " vetoed");
@@ -370,122 +360,12 @@ public:
         }
     }
 
-    void
-    testConfigForced(FeatureBitset features)
-    {
-        testcase("Config-forced features ([features] stanza)");
-
-        using namespace test::jtx;
-
-        auto const forced = featurePriceOracle;
-        auto const forcedHex = to_string(forced);
-
-        Env env{*this, FeatureBitset(forced)};
-
-        auto jrr = env.rpc("server_definitions")[jss::result];
-        if (!BEAST_EXPECT(jrr.isMember(jss::features)))
-            return;
-
-        bool sawForced = false;
-        for (auto it = jrr[jss::features].begin();
-             it != jrr[jss::features].end();
-             ++it)
-        {
-            auto const& f = *it;
-            auto const name = f[jss::name].asString();
-
-            if (!BEAST_EXPECTS(
-                    f.isMember(jss::enabled) && f.isMember(jss::ledger_enabled),
-                    name + " enabled/ledger_enabled"))
-                return;
-
-            BEAST_EXPECTS(
-                !f[jss::ledger_enabled].asBool(), name + " ledger_enabled");
-
-            if (it.key().asString() == forcedHex)
-            {
-                sawForced = true;
-                BEAST_EXPECTS(f[jss::enabled].asBool(), name + " enabled");
-            }
-            else
-            {
-                BEAST_EXPECTS(!f[jss::enabled].asBool(), name + " enabled");
-            }
-        }
-        BEAST_EXPECT(sawForced);
-    }
-
-    void
-    testOnLedger(FeatureBitset features)
-    {
-        testcase("On-ledger plus one config-forced");
-
-        using namespace test::jtx;
-
-        // Veto XahauGenesis: FRESH would otherwise enable it via pseudo-tx.
-        auto const forced = featurePriceOracle;
-        auto const forcedHex = to_string(forced);
-
-        Env env{
-            *this,
-            envconfig([](std::unique_ptr<Config> cfg) {
-                cfg->START_UP = Config::FRESH;
-                cfg->section(SECTION_VETO_AMENDMENTS)
-                    .append(to_string(featureXahauGenesis) + " XahauGenesis");
-                return cfg;
-            }),
-            FeatureBitset(forced)};
-
-        auto jrr = env.rpc("server_definitions")[jss::result];
-        if (!BEAST_EXPECT(jrr.isMember(jss::features)))
-            return;
-
-        bool sawOnLedger = false;
-        bool sawForced = false;
-        for (auto it = jrr[jss::features].begin();
-             it != jrr[jss::features].end();
-             ++it)
-        {
-            uint256 id;
-            (void)id.parseHex(it.key().asString().c_str());
-            auto const& f = *it;
-            auto const name = f[jss::name].asString();
-
-            if (!BEAST_EXPECTS(
-                    f.isMember(jss::enabled) && f.isMember(jss::ledger_enabled),
-                    name + " enabled/ledger_enabled"))
-                return;
-
-            bool const onLedger = env.app().getAmendmentTable().isEnabled(id);
-            bool const isForced = it.key().asString() == forcedHex;
-
-            BEAST_EXPECTS(
-                f[jss::ledger_enabled].asBool() == onLedger,
-                name + " ledger_enabled");
-            BEAST_EXPECTS(
-                f[jss::enabled].asBool() == (onLedger || isForced),
-                name + " enabled");
-
-            if (onLedger)
-                sawOnLedger = true;
-            if (isForced)
-            {
-                sawForced = true;
-                BEAST_EXPECTS(!onLedger, name + " forced not on-ledger");
-            }
-        }
-        BEAST_EXPECT(sawOnLedger);
-        BEAST_EXPECT(sawForced);
-    }
-
     void
     testServerFeatures(FeatureBitset features)
     {
         testNoParams(features);
         testSomeEnabled(features);
         testWithMajorities(features);
-        testConfigForced(features);
-        testOnLedger(features);
     }
 
     void

src/xrpld/app/tx/detail/ClaimReward.cpp

@@ -30,6 +30,12 @@
 
 namespace ripple {
 
+TxConsequences
+ClaimReward::makeTxConsequences(PreflightContext const& ctx)
+{
+    return TxConsequences{ctx.tx, TxConsequences::normal};
+}
+
 NotTEC
 ClaimReward::preflight(PreflightContext const& ctx)
 {

src/xrpld/app/tx/detail/ClaimReward.h

@@ -32,12 +32,15 @@ namespace ripple {
 class ClaimReward : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
 
     explicit ClaimReward(ApplyContext& ctx) : Transactor(ctx)
     {
     }
 
+    static TxConsequences
+    makeTxConsequences(PreflightContext const& ctx);
+
     static NotTEC
     preflight(PreflightContext const& ctx);
 

src/xrpld/app/tx/detail/Cron.cpp

@@ -30,6 +30,12 @@
 
 namespace ripple {
 
+TxConsequences
+Cron::makeTxConsequences(PreflightContext const& ctx)
+{
+    return TxConsequences{ctx.tx, TxConsequences::normal};
+}
+
 NotTEC
 Cron::preflight(PreflightContext const& ctx)
 {

src/xrpld/app/tx/detail/Cron.h

@@ -30,7 +30,7 @@ namespace ripple {
 class Cron : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
 
     explicit Cron(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -39,6 +39,9 @@ public:
     static XRPAmount
     calculateBaseFee(ReadView const& view, STTx const& tx);
 
+    static TxConsequences
+    makeTxConsequences(PreflightContext const& ctx);
+
     static NotTEC
     preflight(PreflightContext const& ctx);
 

src/xrpld/app/tx/detail/CronSet.cpp

@@ -27,6 +27,12 @@
 
 namespace ripple {
 
+TxConsequences
+CronSet::makeTxConsequences(PreflightContext const& ctx)
+{
+    return TxConsequences{ctx.tx, TxConsequences::normal};
+}
+
 NotTEC
 CronSet::preflight(PreflightContext const& ctx)
 {

src/xrpld/app/tx/detail/CronSet.h

@@ -29,7 +29,7 @@ namespace ripple {
 class CronSet : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
 
     explicit CronSet(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -38,6 +38,9 @@ public:
     static XRPAmount
     calculateBaseFee(ReadView const& view, STTx const& tx);
 
+    static TxConsequences
+    makeTxConsequences(PreflightContext const& ctx);
+
     static NotTEC
     preflight(PreflightContext const& ctx);
 

src/xrpld/app/tx/detail/DeleteAccount.cpp

@@ -330,6 +330,9 @@ DeleteAccount::preclaim(PreclaimContext const& ctx)
         if (sleAccount->isFieldPresent(sfHookNamespaces) ||
             sleAccount->isFieldPresent(sfHooks))
             return tecHAS_OBLIGATIONS;
+
+        if (sleAccount->isFieldPresent(sfHookAdministrator))
+            return tecHAS_OBLIGATIONS;
     }
 
     // When fixNFTokenRemint is enabled, we don't allow an account to be

src/xrpld/app/tx/detail/InvariantCheck.cpp

@@ -1038,7 +1038,9 @@ ValidNewAccountRoot::finalize(
     if ((tt == ttPAYMENT || tt == ttIMPORT || tt == ttGENESIS_MINT ||
          tt == ttREMIT || tt == ttAMM_CREATE ||
          tt == ttXCHAIN_ADD_CLAIM_ATTESTATION ||
-         tt == ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION) &&
+         tt == ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION ||
+         (tt == ttHOOK_SET &&
+          view.rules().enabled(featureHookAdministrator))) &&
         isTesSuccess(result))
     {
         std::uint32_t const startingSeq{

src/xrpld/app/tx/detail/Invoke.cpp

@@ -26,6 +26,12 @@
 
 namespace ripple {
 
+TxConsequences
+Invoke::makeTxConsequences(PreflightContext const& ctx)
+{
+    return TxConsequences{ctx.tx, TxConsequences::normal};
+}
+
 NotTEC
 Invoke::preflight(PreflightContext const& ctx)
 {

src/xrpld/app/tx/detail/Invoke.h

@@ -30,7 +30,7 @@ namespace ripple {
 class Invoke : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
 
     explicit Invoke(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -39,6 +39,9 @@ public:
     static XRPAmount
     calculateBaseFee(ReadView const& view, STTx const& tx);
 
+    static TxConsequences
+    makeTxConsequences(PreflightContext const& ctx);
+
     static NotTEC
     preflight(PreflightContext const& ctx);
 

src/xrpld/app/tx/detail/SetHook.cpp

@@ -704,6 +704,21 @@ SetHook::calculateBaseFee(ReadView const& view, STTx const& tx)
 TER
 SetHook::preclaim(ripple::PreclaimContext const& ctx)
 {
+    if (ctx.tx.isFieldPresent(sfHookAdministrator))
+    {
+        auto const& administrator = ctx.tx.getAccountID(sfHookAdministrator);
+        auto const& sle = ctx.view.read(keylet::account(administrator));
+        if (!sle)
+            return tecNO_DST;
+
+        if (!sle->isFieldPresent(sfHookAdministrator))
+            return tecNO_PERMISSION;
+
+        if (sle->getAccountID(sfHookAdministrator) !=
+            ctx.tx.getAccountID(sfAccount))
+            return tecNO_PERMISSION;
+    }
+
     auto const& hookSets = ctx.tx.getFieldArray(sfHooks);
 
     for (auto const& hookSetObj : hookSets)
@@ -743,12 +758,46 @@ SetHook::preflight(PreflightContext const& ctx)
         return ret;
 
     if (ctx.rules.enabled(fixInvalidTxFlags) &&
-        ctx.tx.getFlags() & tfUniversalMask)
+        ctx.tx.getFlags() & tfSetHookMask)
     {
         JLOG(ctx.j.trace()) << "SetHook: Invalid flags set.";
         return temINVALID_FLAG;
     }
 
+    if (ctx.tx.isFlag(tfNewAccount) &&
+        !ctx.rules.enabled(featureHookAdministrator))
+    {
+        JLOG(ctx.j.trace()) << "SetHook: New account flag set but hook "
+                               "administrator amendment is not enabled.";
+        return temDISABLED;
+    }
+
+    if (ctx.tx.isFieldPresent(sfDestination))
+    {
+        if (!ctx.rules.enabled(featureHookAdministrator))
+        {
+            JLOG(ctx.j.trace())
+                << "HookSet: Hook administrator amendment not enabled.";
+            return temDISABLED;
+        }
+
+        if (ctx.tx.isFlag(tfNewAccount))
+        {
+            JLOG(ctx.j.trace())
+                << "HookSet: Both new account flag and destination set. "
+                   "New account flag and destination cannot be set at the same "
+                   "time.";
+            return temMALFORMED;
+        }
+
+        if (ctx.tx.getAccountID(sfDestination) ==
+            ctx.tx.getAccountID(sfAccount))
+        {
+            JLOG(ctx.j.trace()) << "HookSet: Redundant hook administrator.";
+            return temREDUNDANT;
+        }
+    }
+
     if (!ctx.tx.isFieldPresent(sfHooks))
     {
         JLOG(ctx.j.trace())
@@ -1288,6 +1337,23 @@ struct KeyletComparator
     }
 };
 
+AccountID
+randomAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey)
+{
+    // This number must not be changed without an amendment
+    constexpr std::uint16_t maxAccountAttempts = 256;
+    for (std::uint16_t i = 0; i < maxAccountAttempts; ++i)
+    {
+        ripesha_hasher rsh;
+        auto const hash = sha512Half(i, view.info().parentHash, pseudoOwnerKey);
+        rsh(hash.data(), hash.size());
+        AccountID const ret{static_cast<ripesha_hasher::result_type>(rsh)};
+        if (!view.read(keylet::account(ret)))
+            return ret;
+    }
+    return beast::zero;
+}
+
 TER
 SetHook::setHook()
 {
@@ -1307,11 +1373,69 @@ SetHook::setHook()
         .app = ctx_.app,
         .rules = ctx_.view().rules()};
 
-    const int blobMax = hook::maxHookWasmSize();
-    auto const accountKeylet = keylet::account(account_);
-    auto const hookKeylet = keylet::hook(account_);
+    auto targetAccount = ctx.tx[~sfDestination].value_or(account_);
+    if (ctx_.tx.isFlag(tfNewAccount))
+    {
+        // create the new account
+        auto const newAccount = randomAccountAddress(ctx_.view(), uint256{});
+        if (newAccount == beast::zero)
+            return tecDUPLICATE;
 
-    auto accountSLE = view().peek(accountKeylet);
+        auto sleNewAccount = std::make_shared<SLE>(keylet::account(newAccount));
+        sleNewAccount->setAccountID(sfAccount, newAccount);
+        sleNewAccount->setFieldAmount(sfBalance, STAmount{});
+        sleNewAccount->setFieldU32(sfOwnerCount, 1);  // ltHook
+        std::uint32_t const seqno{
+            ctx_.view().rules().enabled(featureXahauGenesis)
+                ? ctx_.view().info().parentCloseTime.time_since_epoch().count()
+                : ctx_.view().rules().enabled(featureDeletableAccounts)
+                ? ctx_.view().seq()
+                : 1};
+        sleNewAccount->setFieldU32(sfSequence, seqno);
+        sleNewAccount->setFieldU32(sfFlags, lsfDisableMaster);
+
+        sleNewAccount->setAccountID(sfHookAdministrator, account_);
+
+        auto sleFees = view().peek(keylet::fees());
+        if (sleFees && view().rules().enabled(featureXahauGenesis))
+        {
+            auto actIdx = sleFees->isFieldPresent(sfAccountCount)
+                ? sleFees->getFieldU64(sfAccountCount)
+                : 0;
+            sleNewAccount->setFieldU64(sfAccountIndex, actIdx);
+            sleFees->setFieldU64(sfAccountCount, actIdx + 1);
+            view().update(sleFees);
+        }
+
+        // fund AccountReserve + ObjectReserve (ltHook)
+        auto const requiredDrops = ctx_.view().fees().accountReserve(1);
+
+        auto sourceSle = ctx_.view().peek(keylet::account(account_));
+        if (!sourceSle)
+            return tefINTERNAL;
+
+        auto const sourceCurrentReserve = ctx_.view().fees().accountReserve(
+            sourceSle->getFieldU32(sfOwnerCount));
+
+        auto const sourceBalance = sourceSle->getFieldAmount(sfBalance).xrp();
+
+        if (sourceBalance < sourceCurrentReserve + requiredDrops)
+            return tecUNFUNDED;
+
+        sourceSle->setFieldAmount(sfBalance, sourceBalance - requiredDrops);
+        ctx_.view().update(sourceSle);
+
+        sleNewAccount->setFieldAmount(sfBalance, requiredDrops);
+        ctx_.view().insert(sleNewAccount);
+
+        targetAccount = newAccount;
+    }
+
+    const int blobMax = hook::maxHookWasmSize();
+
+    auto const hookKeylet = keylet::hook(targetAccount);
+
+    auto accountSLE = view().peek(keylet::account(targetAccount));
 
     ripple::STArray newHooks{sfHooks, 8};
     auto newHookSLE = std::make_shared<SLE>(hookKeylet);

src/xrpld/app/tx/detail/SetRemarks.cpp

@@ -30,6 +30,12 @@
 
 namespace ripple {
 
+TxConsequences
+SetRemarks::makeTxConsequences(PreflightContext const& ctx)
+{
+    return TxConsequences{ctx.tx, TxConsequences::normal};
+}
+
 NotTEC
 SetRemarks::validateRemarks(STArray const& remarks, beast::Journal const& j)
 {

src/xrpld/app/tx/detail/SetRemarks.h

@@ -30,7 +30,7 @@ namespace ripple {
 class SetRemarks : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
 
     explicit SetRemarks(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -39,6 +39,9 @@ public:
     static XRPAmount
     calculateBaseFee(ReadView const& view, STTx const& tx);
 
+    static TxConsequences
+    makeTxConsequences(PreflightContext const& ctx);
+
     static NotTEC
     preflight(PreflightContext const& ctx);
 

src/xrpld/rpc/handlers/ServerDefinitions.cpp

@@ -22,7 +22,6 @@
 #include <xrpld/app/main/Application.h>
 #include <xrpld/app/misc/AmendmentTable.h>
 #include <xrpld/app/misc/NetworkOPs.h>
-#include <xrpld/core/Config.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/json_writer.h>
@@ -546,25 +545,6 @@ doServerDefinitions(RPC::JsonContext& context)
             features[to_string(h)][jss::majority] =
                 t.time_since_epoch().count();
 
-        // getJson's enabled is on-ledger; [features] also apply here.
-        for (auto const& name : features.getMemberNames())
-        {
-            Json::Value& entry = features[name];
-            entry[jss::ledger_enabled] = entry[jss::enabled].asBool();
-        }
-        for (auto const& h : context.app.config().features)
-        {
-            Json::Value& entry = features[to_string(h)];
-            if (!entry.isMember(jss::name))
-            {
-                if (auto const fname = featureToName(h); !fname.empty())
-                    entry[jss::name] = fname;
-            }
-            if (!entry.isMember(jss::ledger_enabled))
-                entry[jss::ledger_enabled] = false;
-            entry[jss::enabled] = true;
-        }
-
         lastFeatures = features;
         {
             const std::string out = Json::FastWriter().write(features);