feat: added changes to implementutxoWholeResult

Signed-off-by: Jenita <[email protected]>

Author: Jenita

cmd/gouroboros/query.go

@@ -279,17 +279,40 @@ func testQuery(f *globalFlags) {
 			}
 		}
 	case "utxo-whole-result":
-		result, err := o.LocalStateQuery().Client.GetUTxOWhole()
+		utxos, err := o.LocalStateQuery().Client.GetUTxOWhole()
 		if err != nil {
 			fmt.Printf("ERROR: failure querying UTxO whole: %s\n", err)
 			os.Exit(1)
 		}
-		jsonData, err := json.MarshalIndent(result, "", "  ")
-		if err != nil {
-			fmt.Printf("ERROR: failed to marshal UTxO whole to JSON: %s\n", err)
-			os.Exit(1)
+
+		for utxoId, utxo := range utxos.Results {
+			fmt.Println("---")
+			fmt.Printf("UTxO ID: %s#%d\n", utxoId.Hash.String(), utxoId.Idx)
+			fmt.Printf("Address: %x\n", utxo.Address)
+			fmt.Printf("Amount: %d\n", utxo.Amount)
+
+			// Handle assets
+			if utxo.Assets != nil {
+				assets := utxo.Assets()
+				fmt.Printf("Assests: %d\n", assets)
+				if assets != nil {
+					fmt.Printf("Assets: %s\n", assets)
+				}
+			}
+
+			// Handle datum
+			if utxo.Datum != nil {
+				datum := utxo.Datum()
+				fmt.Printf("Datum: %d\n", datum)
+				if datum != nil {
+					if cborData := datum.Cbor(); err == nil {
+						fmt.Printf("Datum CBOR: %x\n", cborData)
+					} else {
+						fmt.Printf("Datum present (error decoding: %v)\n", err)
+					}
+				}
+			}
 		}
-		fmt.Println(string(jsonData))
 	default:
 		fmt.Printf("ERROR: unknown query: %s\n", queryFlags.flagset.Args()[0])
 		os.Exit(1)

protocol/localstatequery/client.go

@@ -15,7 +15,6 @@
 package localstatequery
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"sync"
@@ -477,6 +476,90 @@ func (c *Client) GetUTxOByAddress(
 	return &result, nil
 }
 
+func (c *Client) GetUTxOWholeRaw() ([]byte, error) {
+	c.busyMutex.Lock()
+	defer c.busyMutex.Unlock()
+
+	currentEra, err := c.getCurrentEra()
+	if err != nil {
+		return nil, err
+	}
+
+	query := buildShelleyQuery(
+		currentEra,
+		QueryTypeShelleyUtxoWhole,
+	)
+
+	msg := NewMsgQuery(query)
+	if !c.acquired {
+		if err := c.acquire(AcquireVolatileTip{}); err != nil {
+			return nil, err
+		}
+	}
+	if err := c.SendMessage(msg); err != nil {
+		return nil, err
+	}
+	resultCbor, ok := <-c.queryResultChan
+	if !ok {
+		return nil, protocol.ErrProtocolShuttingDown
+	}
+	return resultCbor, nil
+}
+
+func decodeSimpleUTxO(rawCBOR []byte) (map[string]map[string]interface{}, error) {
+	var cborData []interface{}
+	if _, err := cbor.Decode(rawCBOR, &cborData); err != nil {
+		return nil, fmt.Errorf("CBOR decode error: %v", err)
+	}
+
+	result := make(map[string]map[string]interface{})
+
+	for _, entry := range cborData {
+		entrySlice, ok := entry.([]interface{})
+		if !ok || len(entrySlice) != 2 {
+			continue
+		}
+
+		// Decode input (TxId + index)
+		input, ok := entrySlice[0].([]interface{})
+		if !ok || len(input) != 2 {
+			continue
+		}
+
+		txId, ok := input[0].([]byte)
+		if !ok {
+			continue
+		}
+
+		outputIdx, ok := input[1].(uint64)
+		if !ok {
+			continue
+		}
+
+		// Decode output (address + value)
+		output, ok := entrySlice[1].([]interface{})
+		if !ok || len(output) != 2 {
+			continue
+		}
+
+		address, ok := output[0].([]byte)
+		if !ok {
+			continue
+		}
+
+		value := output[1] // Could be uint64 (lovelace) or map (multi-asset)
+
+		// Create entry
+		key := fmt.Sprintf("%x#%d", txId, outputIdx)
+		result[key] = map[string]interface{}{
+			"address": address,
+			"value":   value,
+		}
+	}
+
+	return result, nil
+}
+
 // GetUTxOWhole returns the current UTxO set
 func (c *Client) GetUTxOWhole() (*UTxOWholeResult, error) {
 	c.Protocol.Logger().
@@ -500,12 +583,12 @@ func (c *Client) GetUTxOWhole() (*UTxOWholeResult, error) {
 	if err := c.runQuery(query, &result); err != nil {
 		return nil, err
 	}
-	jsonData, err := json.MarshalIndent(result, "", "  ")
-	if err != nil {
-		return nil, fmt.Errorf("error marshaling UTxOWhole result to JSON: %w", err)
-	}
-	fmt.Println("UTxOWhole Result:")
-	fmt.Println(string(jsonData))
+	// jsonData, err := json.MarshalIndent(result, "", "  ")
+	// if err != nil {
+	// 	return nil, fmt.Errorf("error marshaling UTxOWhole result to JSON: %w", err)
+	// }
+	// fmt.Println("UTxOWhole Result:")
+	// fmt.Println(string(jsonData))
 	return &result, nil
 }
 

protocol/localstatequery/queries.go

@@ -596,7 +596,10 @@ func (u *UtxoId) MarshalCBOR() ([]byte, error) {
 /*
 result	[{* utxo => value }]
 */
-type UTxOWholeResult any
+type UTxOWholeResult struct {
+	cbor.StructAsArray
+	Results map[UtxoId]ledger.BabbageTransactionOutput
+}
 
 // TODO (#863)
 type DebugEpochStateResult any