Make print-xdr display account IDs properly

src/main/dumpxdr.cpp

@@ -1,8 +1,10 @@
 #include "main/dumpxdr.h"
 #include "crypto/Hex.h"
 #include "crypto/SecretKey.h"
+#include "crypto/StrKey.h"
 #include "transactions/SignatureUtils.h"
 #include "transactions/TransactionBridge.h"
+#include "transactions/TransactionUtils.h"
 #include "util/Decoder.h"
 #include "util/Fs.h"
 #include "util/XDROperators.h"
@@ -111,11 +113,28 @@ namespace stellar
 {
 
 std::string
-xdr_printer(const PublicKey& pk)
+xdr_printer(PublicKey const& pk)
 {
     return KeyUtils::toStrKey<PublicKey>(pk);
 }
 
+std::string
+xdr_printer(MuxedAccount const& muxedAccount)
+{
+    switch (muxedAccount.type())
+    {
+    case KEY_TYPE_ED25519:
+        return KeyUtils::toStrKey(toAccountID(muxedAccount));
+    case KEY_TYPE_MUXED_ED25519:
+        return fmt::format("{{ id = {}, accountID = {} }}",
+                           muxedAccount.med25519().id,
+                           KeyUtils::toStrKey(toAccountID(muxedAccount)));
+    default:
+        // this would be a bug
+        abort();
+    }
+}
+
 template <typename T>
 void
 dumpstream(XDRInputFileStream& in, bool json)

src/overlay/StellarXDR.h

@@ -8,5 +8,6 @@
 namespace stellar
 {
 
-std::string xdr_printer(const PublicKey& pk);
+std::string xdr_printer(PublicKey const& pk);
+std::string xdr_printer(MuxedAccount const& ma);
 }