only build Release on release branch

.github/workflows/build-in-docker.yml

@@ -14,7 +14,7 @@ jobs:
   checkout:
     runs-on: [self-hosted, vanity]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         clean: false
   checkpatterns:

build-core.sh

@@ -34,7 +34,21 @@ message(\"WasmEdge DONE\")
 git checkout src/ripple/protocol/impl/BuildInfo.cpp &&
 sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)+$4\"/g src/ripple/protocol/impl/BuildInfo.cpp &&
 cd release-build &&
-cmake .. -DCMAKE_BUILD_TYPE=Release -DBoost_NO_BOOST_CMAKE=ON -DLLVM_DIR=/usr/lib64/llvm13/lib/cmake/llvm/ -DLLVM_LIBRARY_DIR=/usr/lib64/llvm13/lib/ -DWasmEdge_LIB=/usr/local/lib64/libwasmedge.a &&
+if [[ "$(git rev-parse --abbrev-ref HEAD)" == "release" ]]; then
+  echo "On release branch: Building with Release configuration"
+  cmake .. -DCMAKE_BUILD_TYPE=Release -DBoost_NO_BOOST_CMAKE=ON \
+    -DLLVM_DIR=/usr/lib64/llvm13/lib/cmake/llvm/ \
+    -DLLVM_LIBRARY_DIR=/usr/lib64/llvm13/lib/ \
+    -DWasmEdge_LIB=/usr/local/lib64/libwasmedge.a
+else
+  echo "Not on release branch ($BRANCH): Building with default configuration"
+  cmake .. -DCMAKE_BUILD_TYPE=Debug \
+    -DBoost_NO_BOOST_CMAKE=ON \
+    -DLLVM_DIR=/usr/lib64/llvm13/lib/cmake/llvm/ \
+    -DLLVM_LIBRARY_DIR=/usr/lib64/llvm13/lib/ \
+    -DWasmEdge_LIB=/usr/local/lib64/libwasmedge.a \
+    -Dassert=ON
+fi
 make -j$3 VERBOSE=1 &&
 strip -s rippled &&
 mv rippled xahaud &&

release-builder.sh

@@ -36,8 +36,7 @@ fi
 
 STATIC_CONTAINER=$(docker ps -a | grep $CONTAINER_NAME |wc -l)
 
-#if [[ "$STATIC_CONTAINER" -gt "0" && "$GITHUB_REPOSITORY" != "" ]]; then
-if false; then
+if [[ "$STATIC_CONTAINER" -gt "0" && "$GITHUB_REPOSITORY" != "" ]]; then
   echo "Static container, execute in static container to have max. cache"
   docker start $CONTAINER_NAME
   docker exec -i $CONTAINER_NAME /hbb_exe/activate-exec bash -x /io/build-core.sh "$GITHUB_REPOSITORY" "$GITHUB_SHA" "$BUILD_CORES" "$GITHUB_RUN_NUMBER"

src/ripple/app/hook/Guard.h

@@ -3,7 +3,6 @@
 #include <iostream>
 #include <map>
 #include <memory>
-#include <optional>
 #include <ostream>
 #include <stack>
 #include <string>
@@ -272,19 +271,7 @@ check_guard(
     int guard_func_idx,
     int last_import_idx,
     GuardLog guardLog,
-    std::string guardLogAccStr,
-    /* RH NOTE:
-     * rules version is a bit field, so rule update 1 is 0x01, update 2 is 0x02
-     * and update 3 is 0x04 ideally at rule version 3 all bits so far are set
-     * (0b111) so the ruleVersion = 7, however if a specific rule update must be
-     * rolled back due to unforeseen behaviour then this may no longer be the
-     * case. using a bit field here leaves us flexible to rollback changes that
-     * might have unforeseen consequences, without also rolling back further
-     * changes that are fine.
-     */
-    uint64_t rulesVersion = 0
-
-)
+    std::string guardLogAccStr)
 {
 #define MAX_GUARD_CALLS 1024
     uint32_t guard_count = 0;
@@ -634,17 +621,11 @@ check_guard(
             }
             else if (fc_type == 10)  // memory.copy
             {
-                if (rulesVersion & 0x02U)
-                    GUARD_ERROR("Memory.copy instruction is not allowed.");
-
                 REQUIRE(2);
                 ADVANCE(2);
             }
             else if (fc_type == 11)  // memory.fill
             {
-                if (rulesVersion & 0x02U)
-                    GUARD_ERROR("Memory.fill instruction is not allowed.");
-
                 ADVANCE(1);
             }
             else if (fc_type <= 7)  // numeric instructions
@@ -826,15 +807,6 @@ validateGuards(
     std::vector<uint8_t> const& wasm,
     GuardLog guardLog,
     std::string guardLogAccStr,
-    /* RH NOTE:
-     * rules version is a bit field, so rule update 1 is 0x01, update 2 is 0x02
-     * and update 3 is 0x04 ideally at rule version 3 all bits so far are set
-     * (0b111) so the ruleVersion = 7, however if a specific rule update must be
-     * rolled back due to unforeseen behaviour then this may no longer be the
-     * case. using a bit field here leaves us flexible to rollback changes that
-     * might have unforeseen consequences, without also rolling back further
-     * changes that are fine.
-     */
     uint64_t rulesVersion = 0)
 {
     uint64_t byteCount = wasm.size();
@@ -1505,8 +1477,7 @@ validateGuards(
                     guard_import_number,
                     last_import_number,
                     guardLog,
-                    guardLogAccStr,
-                    rulesVersion);
+                    guardLogAccStr);
 
                 if (!valid)
                     return {};

src/ripple/app/hook/guard_checker.cpp

@@ -79,7 +79,7 @@ main(int argc, char** argv)
 
     close(fd);
 
-    auto result = validateGuards(hook, std::cout, "", 3);
+    auto result = validateGuards(hook, std::cout, "", 1);
 
     if (!result)
     {

src/ripple/app/tx/impl/Change.cpp

@@ -587,8 +587,7 @@ Change::activateXahauGenesis()
                 wasmBytes,  // wasm to verify
                 loggerStream,
                 "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
-                (ctx_.view().rules().enabled(featureHooksUpdate1) ? 1 : 0) +
-                    (ctx_.view().rules().enabled(fix20250131) ? 2 : 0));
+                ctx_.view().rules().enabled(featureHooksUpdate1) ? 1 : 0);
 
             if (!result)
             {

src/ripple/app/tx/impl/Remit.cpp

@@ -72,16 +72,6 @@ Remit::preflight(PreflightContext const& ctx)
         return temREDUNDANT;
     }
 
-    if (ctx.rules.enabled(fix20250131))
-    {
-        if (!dstID || dstID == noAccount())
-        {
-            JLOG(ctx.j.warn())
-                << "Malformed transaction: Remit to invalid account.";
-            return temMALFORMED;
-        }
-    }
-
     if (ctx.tx.isFieldPresent(sfInform))
     {
         AccountID const infID = ctx.tx.getAccountID(sfInform);

src/ripple/app/tx/impl/SetHook.cpp

@@ -479,8 +479,7 @@ SetHook::validateHookSetEntry(SetHookCtx& ctx, STObject const& hookSetObj)
                     hook,  // wasm to verify
                     logger,
                     hsacc,
-                    (ctx.rules.enabled(featureHooksUpdate1) ? 1 : 0) +
-                        (ctx.rules.enabled(fix20250131) ? 2 : 0));
+                    ctx.rules.enabled(featureHooksUpdate1) ? 1 : 0);
 
                 if (ctx.j.trace())
                 {

src/ripple/protocol/Feature.h

@@ -74,7 +74,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 = 77;
+static constexpr std::size_t numFeatures = 76;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated
@@ -364,7 +364,6 @@ extern uint256 const fix240911;
 extern uint256 const fixFloatDivide;
 extern uint256 const fixReduceImport;
 extern uint256 const fixXahauV3;
-extern uint256 const fix20250131;
 
 }  // namespace ripple
 

src/ripple/protocol/impl/BuildInfo.cpp

@@ -33,13 +33,8 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "0.0.0"
+char const* const versionString = "0.0.0";
 // clang-format on
-#ifdef DEBUG
-    "+DEBUG"
-#endif
-    //--------------------------------------------------------------------------
-    ;
 
 //
 // Don't touch anything below this line
@@ -51,9 +46,7 @@ getVersionString()
     // if the external build engine fails to populate the version string,
     // then we will do it ourselves.
     static std::string generatedVersionString;
-    if (generatedVersionString == "" &&
-        (versionString == std::string("0.") + std::string("0.0") ||
-         versionString == std::string("0.0.0+DEBUG")))
+    if (generatedVersionString == "" && versionString == std::string("0.0.0"))
     {
         std::string y = std::string(__DATE__ + 7);
         std::string d = std::string(

src/ripple/protocol/impl/Feature.cpp

@@ -469,8 +469,7 @@ REGISTER_FIX    (fixPageCap,                    Supported::yes, VoteBehavior::De
 REGISTER_FIX    (fix240911,                     Supported::yes, VoteBehavior::DefaultYes);
 REGISTER_FIX    (fixFloatDivide,                Supported::yes, VoteBehavior::DefaultYes);
 REGISTER_FIX    (fixReduceImport,               Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fixXahauV3,                    Supported::yes, VoteBehavior::DefaultYes);
-REGISTER_FIX    (fix20250131,                   Supported::yes, VoteBehavior::DefaultYes);
+REGISTER_FIX    (fixXahauV3,                    Supported::yes, VoteBehavior::DefaultNo);
 
 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.

src/test/app/SetHookTSH_test.cpp

@@ -5544,6 +5544,7 @@ public:
         testTSH(sa - fixXahauV1 - fixXahauV2);
         testTSH(sa - fixXahauV2);
         testTSH(sa);
+        // testEmittedTxn(sa - fixXahauV2);
         testEmittedTxn(sa);
     }
 };

src/test/app/SetHook_test.cpp

@@ -1138,54 +1138,6 @@ public:
                                                      : preHookCount + 66);
     }
 
-    void
-    testFillCopy(FeatureBitset features)
-    {
-        testcase("Test fill/copy");
-
-        // a hook containing memory.fill instruction
-        std::string hookFill =
-            "0061736d0100000001130360027f7f017f60037f7f7e017e60017f017e02"
-            "170203656e76025f67000003656e76066163636570740001030201020503"
-            "0100020621057f01418088040b7f004180080b7f004180080b7f00418088"
-            "040b7f004180080b07080104686f6f6b00020aa4800001a0800001017e23"
-            "01412a41e400fc0b004101410110001a41004100420010011a20010b";
-
-        // a hook containing memory.copy instruction
-        std::string hookCopy =
-            "0061736d0100000001130360027f7f017f60037f7f7e017e60017f017e02"
-            "170203656e76025f67000003656e76066163636570740001030201020503"
-            "0100020621057f01418088040b7f004180080b7f004180080b7f00418088"
-            "040b7f004180080b07080104686f6f6b00020aa5800001a1800001017e23"
-            "00230141e400fc0a00004101410110001a41004100420010011a20010b";
-
-        using namespace jtx;
-
-        for (int withFix = 0; withFix < 2; ++withFix)
-        {
-            auto f = withFix ? features : features - fix20250131;
-            Env env{*this, f};
-
-            auto const alice = Account{"alice"};
-            env.fund(XRP(10000), alice);
-
-            auto const bob = Account{"bob"};
-            env.fund(XRP(10000), bob);
-
-            env(ripple::test::jtx::hook(alice, {{hso(hookFill)}}, 0),
-                M(withFix ? "hookFill - with fix" : "hookFill - zonder fix"),
-                HSFEE,
-                withFix ? ter(temMALFORMED) : ter(tesSUCCESS));
-
-            env(ripple::test::jtx::hook(bob, {{hso(hookCopy)}}, 0),
-                M(withFix ? "hookCopy - with fix" : "hookCopy - zonder fix"),
-                HSFEE,
-                withFix ? ter(temMALFORMED) : ter(tesSUCCESS));
-
-            env.close();
-        }
-    }
-
     void
     testCreate(FeatureBitset features)
     {
@@ -12021,8 +11973,6 @@ public:
         testNSDeletePartial(features);
         testPageCap(features);
 
-        testFillCopy(features);
-
         testWasm(features);
         test_accept(features);
         test_rollback(features);