Merge pull request #4247 from sisuresh/upgrade-key

Define custom cereal override for ConfigUpgradeSetKey and use it Reviewed-by: dmkozh
stellar · Apr 11, 2024 · 2725b15 · 2725b15
2 parents 962b109 + f3ffbbe
commit 2725b15
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/src/herder/Upgrades.cpp b/src/herder/Upgrades.cpp
@@ -24,6 +24,7 @@
 #include "util/Logging.h"
 #include "util/ProtocolVersion.h"
 #include "util/Timer.h"
+#include "util/XDRCereal.h"
 #include "util/types.h"
 #include "xdrpp/printer.h"
 #include <Tracy.hpp>
@@ -33,7 +34,6 @@
 #include <fmt/format.h>
 #include <optional>
 #include <regex>
-#include <xdrpp/cereal.h>
 #include <xdrpp/marshal.h>
 
 namespace cereal
@@ -393,7 +393,7 @@ Upgrades::toString(LedgerUpgrade const& upgrade)
     case LEDGER_UPGRADE_CONFIG:
         return fmt::format(
             FMT_STRING("{}"),
-            xdr::xdr_to_string(upgrade.newConfig(), "configupgradesetkey"));
+            xdr_to_string(upgrade.newConfig(), "configupgradesetkey"));
     case LEDGER_UPGRADE_MAX_SOROBAN_TX_SET_SIZE:
         return fmt::format(FMT_STRING("maxsorobantxsetsize={:d}"),
                            upgrade.newMaxSorobanTxSetSize());
@@ -436,8 +436,8 @@ Upgrades::toString() const
     {
         maybePrintUpgradeTime();
         r << fmt::format(FMT_STRING(", {}"),
-                         xdr::xdr_to_string(*mParams.mConfigUpgradeSetKey,
-                                            "configupgradesetkey"));
+                         xdr_to_string(*mParams.mConfigUpgradeSetKey,
+                                       "configupgradesetkey"));
     }
     return r.str();
 }

diff --git a/src/herder/test/UpgradesTests.cpp b/src/herder/test/UpgradesTests.cpp
@@ -3058,7 +3058,7 @@ TEST_CASE("upgrades serialization roundtrip", "[upgrades]")
       "configupgradeset" : {
          "updatedEntry" : [
             {
-               "configSettingID" : 0,
+               "configSettingID" : "CONFIG_SETTING_CONTRACT_MAX_SIZE_BYTES",
                "contractMaxSizeBytes" : 32768
             }
          ]

diff --git a/src/util/XDRCereal.cpp b/src/util/XDRCereal.cpp
@@ -35,6 +35,23 @@ cereal_override(cereal::JSONOutputArchive& ar, const stellar::SCAddress& addr,
     }
 }
 
+void
+cereal_override(cereal::JSONOutputArchive& ar,
+                const stellar::ConfigUpgradeSetKey& key, const char* field)
+{
+    ar.setNextName(field);
+    ar.startNode();
+
+    xdr::archive(ar,
+                 stellar::strKey::toStrKey(stellar::strKey::STRKEY_CONTRACT,
+                                           key.contractID)
+                     .value,
+                 "contractID");
+    xdr::archive(ar, key.contentHash, "contentHash");
+
+    ar.finishNode();
+}
+
 void
 cereal_override(cereal::JSONOutputArchive& ar,
                 const stellar::MuxedAccount& muxedAccount, const char* field)

diff --git a/src/util/XDRCereal.h b/src/util/XDRCereal.h
@@ -81,6 +81,10 @@ void cereal_override(cereal::JSONOutputArchive& ar, const stellar::PublicKey& s,
 void cereal_override(cereal::JSONOutputArchive& ar,
                      const stellar::SCAddress& addr, const char* field);
 
+void cereal_override(cereal::JSONOutputArchive& ar,
+                     const stellar::ConfigUpgradeSetKey& key,
+                     const char* field);
+
 void cereal_override(cereal::JSONOutputArchive& ar,
                      const stellar::MuxedAccount& muxedAccount,
                      const char* field);