fix: creditOutputs in AssetLock tx json output should be an array o…

…f objects, not debug strings
UdjinM6 · Aug 23, 2024 · ba0e645 · ba0e645
1 parent 045e178
commit ba0e645
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/evo/assetlocktx.h b/src/evo/assetlocktx.h
@@ -9,6 +9,7 @@
 #include <primitives/transaction.h>
 #include <gsl/pointers.h>
 
+#include <core_io.h>
 #include <serialize.h>
 #include <univalue.h>
 
@@ -51,14 +52,18 @@ class CAssetLockPayload
 
     [[nodiscard]] UniValue ToJson() const
     {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", int(nVersion));
-        UniValue outputs;
-        outputs.setArray();
-        for (const CTxOut& out : creditOutputs) {
-            outputs.push_back(out.ToString());
+        UniValue outputs(UniValue::VARR);
+        for (const CTxOut& credit_output : creditOutputs) {
+            UniValue out(UniValue::VOBJ);
+            out.pushKV("value", ValueFromAmount(credit_output.nValue));
+            out.pushKV("valueSat", credit_output.nValue);
+            UniValue spk(UniValue::VOBJ);
+            ScriptPubKeyToUniv(credit_output.scriptPubKey, spk, /* fIncludeHex = */ true, /* include_addresses = */ false);
+            out.pushKV("scriptPubKey", spk);
+            outputs.push_back(out);
         }
+        UniValue obj(UniValue::VOBJ);
+        obj.pushKV("version", int(nVersion));
         obj.pushKV("creditOutputs", outputs);
         return obj;
     }

diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
@@ -102,6 +102,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "llmq/chainlocks -> net_processing -> llmq/context -> llmq/chainlocks"
     "coinjoin/client -> coinjoin/coinjoin -> llmq/chainlocks -> net_processing -> coinjoin/client"
     "rpc/blockchain -> rpc/server -> rpc/blockchain"
+    "core_io -> evo/assetlocktx -> core_io"
 )
 
 EXIT_CODE=0