Namecoin / Qt: Show .bit form for d/ names in TransactionRecord

namecoin · Dec 30, 2021 · 753920c · 753920c
1 parent ff02537
commit 753920c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/src/names/applications.cpp b/src/names/applications.cpp
@@ -188,3 +188,35 @@ NamespaceFromName (const valtype& data)
 
     return NamespaceFromName(name);
 }
+
+std::string
+DescFromName (const std::string& name, NameNamespace ns)
+{
+    switch (ns)
+    {
+        case NameNamespace::Domain:
+        {
+            const std::string nsStr = NamespaceToString(ns);
+            const auto nsLen = nsStr.length();
+
+            const std::string label = name.substr(nsLen);
+
+            return label + ".bit";
+        }
+        default:
+        {
+            // TODO: Refactor DescFromName and EncodeNameForMessage to avoid double conversion
+            const valtype vtName = valtype (name.begin (), name.end ());
+
+            return EncodeNameForMessage(vtName);
+        }
+    }
+}
+
+std::string
+DescFromName (const valtype& data, NameNamespace ns)
+{
+    std::string name = std::string (data.begin (), data.end ());
+
+    return DescFromName(name, ns);
+}
diff --git a/src/names/applications.h b/src/names/applications.h
@@ -21,4 +21,7 @@ enum class NameNamespace
 NameNamespace NamespaceFromName (const std::string& name);
 NameNamespace NamespaceFromName (const valtype& data);
 
+std::string DescFromName (const std::string& name, NameNamespace ns);
+std::string DescFromName (const valtype& data, NameNamespace ns);
+
 #endif // H_BITCOIN_NAMES_APPLICATIONS
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -9,7 +9,6 @@
 #include <interfaces/wallet.h>
 #include <key_io.h>
 #include <names/applications.h>
-#include <names/encoding.h>
 #include <script/names.h>
 #include <wallet/ismine.h>
 
@@ -130,7 +129,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
                 }
 
                 nameSub.nameNamespace = NamespaceFromName(nNameCredit.value().getOpName());
-                nameSub.address = EncodeNameForMessage(nNameCredit.value().getOpName());
+                nameSub.address = DescFromName(nNameCredit.value().getOpName(), nameSub.nameNamespace);
             }
             else
             {
@@ -144,7 +143,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
             if(nNameDebit.value().isAnyUpdate())
             {
                 nameSub.nameNamespace = NamespaceFromName(nNameDebit.value().getOpName());
-                nameSub.address = EncodeNameForMessage(nNameDebit.value().getOpName());
+                nameSub.address = DescFromName(nNameDebit.value().getOpName(), nameSub.nameNamespace);
             }
         }