Merge branch 'dev' into backport-levelization

This reverts commit 5c1d7d9ae9.

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)
 

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;