fix: creditOutputs in AssetLock tx json output should be an array of objects, not debug strings

doc/release-notes-6229.md

@@ -0,0 +1,4 @@
+RPC changes
+-----------
+
+- `creditOutputs` entries in various RPCs that output transaction JSON are shown as objects now instead of being shown as strings.

src/evo/assetlocktx.h

@@ -22,6 +22,10 @@ namespace llmq {
 class CQuorumManager;
 } // namespace llmq
 
+// Forward declaration from core_io to get rid of circular dependency
+UniValue ValueFromAmount(const CAmount amount);
+void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex, bool include_addresses);
+
 class CAssetLockPayload
 {
 public:
@@ -51,14 +55,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;
     }

test/functional/feature_asset_locks.py

@@ -30,12 +30,9 @@
 from test_framework.script import (
     CScript,
     OP_CHECKSIG,
-    OP_DUP,
-    OP_EQUALVERIFY,
-    OP_HASH160,
     OP_RETURN,
-    hash160,
 )
+from test_framework.script_util import key_to_p2pkh_script
 from test_framework.test_framework import DashTestFramework
 from test_framework.util import (
     assert_equal,
@@ -66,8 +63,8 @@ def create_assetlock(self, coin, amount, pubkey):
         tmp_amount = amount
         if tmp_amount > COIN:
             tmp_amount -= COIN
-            credit_outputs.append(CTxOut(COIN, CScript([OP_DUP, OP_HASH160, hash160(pubkey), OP_EQUALVERIFY, OP_CHECKSIG])))
-        credit_outputs.append(CTxOut(tmp_amount, CScript([OP_DUP, OP_HASH160, hash160(pubkey), OP_EQUALVERIFY, OP_CHECKSIG])))
+            credit_outputs.append(CTxOut(COIN, key_to_p2pkh_script(pubkey)))
+        credit_outputs.append(CTxOut(tmp_amount, key_to_p2pkh_script(pubkey)))
 
         lockTx_payload = CAssetLockTx(1, credit_outputs)
 
@@ -283,7 +280,11 @@ def test_asset_locks(self, node_wallet, node, pubkey):
         self.check_mempool_result(tx=asset_lock_tx, result_expected={'allowed': True, 'fees': {'base': Decimal(str(tiny_amount / COIN))}})
         self.validate_credit_pool_balance(0)
         txid_in_block = self.send_tx(asset_lock_tx)
-        assert "assetLockTx" in node.getrawtransaction(txid_in_block, 1)
+        rpc_tx = node.getrawtransaction(txid_in_block, 1)
+        assert_equal(len(rpc_tx["assetLockTx"]["creditOutputs"]), 2)
+        assert_equal(rpc_tx["assetLockTx"]["creditOutputs"][0]["valueSat"] + rpc_tx["assetLockTx"]["creditOutputs"][1]["valueSat"], locked_1)
+        assert_equal(rpc_tx["assetLockTx"]["creditOutputs"][0]["scriptPubKey"]["hex"], key_to_p2pkh_script(pubkey).hex())
+        assert_equal(rpc_tx["assetLockTx"]["creditOutputs"][1]["scriptPubKey"]["hex"], key_to_p2pkh_script(pubkey).hex())
         self.validate_credit_pool_balance(0)
         node.generate(1)
         assert_equal(self.get_credit_pool_balance(node=node), locked_1)