Merge branch 'dev' into backport-levelization

This reverts commit 5c1d7d9ae9.

README.md

@@ -12,7 +12,7 @@ The server software that powers Xahau is called `xahaud` and is available in thi
 
 ### Build from Source
 
-* [Read the build instructions in our documentation](https://xahau.network/docs/infrastructure/build-xahaud/)
+* [Read the build instructions in our documentation](https://xahau.network/infrastructure/building-xahau)
 * If you encounter any issues, please [open an issue](https://github.com/xahau/xahaud/issues)
 
 ## Highlights of Xahau

cmake/RippledCore.cmake

@@ -68,17 +68,6 @@ target_link_libraries(xrpl.imports.main
     $<$<BOOL:${voidstar}>:antithesis-sdk-cpp>
 )
 
-# date-tz for enhanced logging (always linked, code is #ifdef guarded)
-if(TARGET date::date-tz)
-  target_link_libraries(xrpl.imports.main INTERFACE date::date-tz)
-endif()
-
-# BEAST_ENHANCED_LOGGING: enable for Debug builds OR when explicitly requested
-# Uses generator expression so it works with multi-config generators (Xcode, VS, Ninja Multi-Config)
-target_compile_definitions(xrpl.imports.main INTERFACE
-  $<$<OR:$<CONFIG:Debug>,$<BOOL:${BEAST_ENHANCED_LOGGING}>>:BEAST_ENHANCED_LOGGING=1>
-)
-
 include(add_module)
 include(target_link_modules)
 

hook/sfcodes.h

@@ -240,7 +240,6 @@
 #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)

include/xrpl/protocol/Feature.h

@@ -80,7 +80,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t numFeatures = 114;
+static constexpr std::size_t numFeatures = 113;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated

include/xrpl/protocol/TxFlags.h

@@ -223,11 +223,6 @@ 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

@@ -31,7 +31,6 @@
 // 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(HookAPISerializedType240,   Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PermissionedDomains,        Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FEATURE(DynamicNFT,                 Supported::no,  VoteBehavior::DefaultNo)

include/xrpl/protocol/detail/ledger_entries.macro

@@ -262,7 +262,6 @@ LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
     {sfHookStateScale,       soeOPTIONAL},
     {sfCron,                 soeOPTIONAL},
     {sfAMMID,                soeOPTIONAL},
-    {sfHookAdministrator,    soeOPTIONAL},
 }))
 
 /** A ledger object which contains a list of object identifiers.

include/xrpl/protocol/detail/sfields.macro

@@ -317,7 +317,6 @@ 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,7 +195,6 @@ 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. */

src/test/jtx/impl/hook.cpp

@@ -65,16 +65,29 @@ hso_delete(void (*f)(Json::Value& jv))
 Json::Value
 hso(std::vector<uint8_t> const& wasmBytes, void (*f)(Json::Value& jv))
 {
-    return hso(strHex(wasmBytes), f);
+    if (wasmBytes.size() == 0)
+        throw std::runtime_error("empty hook wasm passed to hso()");
+
+    Json::Value jv;
+    jv[jss::CreateCode] = strHex(wasmBytes);
+    {
+        jv[jss::HookOn] =
+            "0000000000000000000000000000000000000000000000000000000000000000";
+        jv[jss::HookNamespace] = to_string(uint256{beast::zero});
+        jv[jss::HookApiVersion] = Json::Value{0};
+    }
+
+    if (f)
+        f(jv);
+
+    return jv;
 }
 
 Json::Value
 hso(std::string const& wasmHex, void (*f)(Json::Value& jv))
 {
     if (wasmHex.size() == 0)
-        throw std::runtime_error(
-            "empty hook wasm passed to hso(): run "
-            "src/test/app/build_test_hooks.sh to generate the hook wasm");
+        throw std::runtime_error("empty hook wasm passed to hso()");
 
     Json::Value jv;
     jv[jss::CreateCode] = wasmHex;

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

@@ -330,9 +330,6 @@ 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

@@ -1037,9 +1037,7 @@ 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 == ttHOOK_SET &&
-          view.rules().enabled(featureHookAdministrator))) &&
+         tt == ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION) &&
         isTesSuccess(result))
     {
         std::uint32_t const startingSeq{

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

@@ -675,21 +675,6 @@ 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)
@@ -729,46 +714,12 @@ SetHook::preflight(PreflightContext const& ctx)
         return ret;
 
     if (ctx.rules.enabled(fixInvalidTxFlags) &&
-        ctx.tx.getFlags() & tfSetHookMask)
+        ctx.tx.getFlags() & tfUniversalMask)
     {
         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())
@@ -1304,23 +1255,6 @@ 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()
 {
@@ -1340,69 +1274,11 @@ SetHook::setHook()
         .app = ctx_.app,
         .rules = ctx_.view().rules()};
 
-    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 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 accountKeylet = keylet::account(account_);
+    auto const hookKeylet = keylet::hook(account_);
 
-    auto const hookKeylet = keylet::hook(targetAccount);
-
-    auto accountSLE = view().peek(keylet::account(targetAccount));
+    auto accountSLE = view().peek(accountKeylet);
 
     ripple::STArray newHooks{sfHooks, 8};
     auto newHookSLE = std::make_shared<SLE>(hookKeylet);