Merge pull request #381 from blinklabs-io/feat/ledger-tx-output-cbor

feat: expose original CBOR for TX outputs

Author: agaffney

cmd/block-fetch/main.go

@@ -100,6 +100,7 @@ func main() {
 			}
 			fmt.Printf("  Outputs:\n")
 			for _, output := range tx.Outputs() {
+				fmt.Printf("    Cbor (hex): %x\n", output.Cbor())
 				fmt.Printf("    Address: %s\n", output.Address())
 				fmt.Printf("    Amount: %d\n", output.Amount())
 				assets := output.Assets()

ledger/alonzo.go

@@ -106,28 +106,31 @@ func (b *AlonzoTransactionBody) UnmarshalCBOR(cborData []byte) error {
 func (b *AlonzoTransactionBody) Outputs() []TransactionOutput {
 	ret := []TransactionOutput{}
 	for _, output := range b.TxOutputs {
-		ret = append(ret, output)
+		output := output
+		ret = append(ret, &output)
 	}
 	return ret
 }
 
 type AlonzoTransactionOutput struct {
 	cbor.StructAsArray
-	cbor.DecodeStoreCbor
+	cborData          []byte
 	OutputAddress     Address
 	OutputAmount      MaryTransactionOutputValue
 	TxOutputDatumHash *Blake2b256
 }
 
 func (o *AlonzoTransactionOutput) UnmarshalCBOR(cborData []byte) error {
+	// Save original CBOR
+	o.cborData = cborData[:]
 	// Try to parse as Mary output first
 	var tmpOutput MaryTransactionOutput
 	if _, err := cbor.Decode(cborData, &tmpOutput); err == nil {
 		// Copy from temp Shelley output to Alonzo format
 		o.OutputAddress = tmpOutput.OutputAddress
 		o.OutputAmount = tmpOutput.OutputAmount
 	} else {
-		return o.UnmarshalCbor(cborData, o)
+		return cbor.DecodeGeneric(cborData, o)
 	}
 	return nil
 }
@@ -149,6 +152,10 @@ func (o AlonzoTransactionOutput) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&tmpObj)
 }
 
+func (o *AlonzoTransactionOutput) Cbor() []byte {
+	return o.cborData
+}
+
 func (o AlonzoTransactionOutput) Address() Address {
 	return o.OutputAddress
 }

ledger/babbage.go

@@ -150,7 +150,8 @@ func (b *BabbageTransactionBody) UnmarshalCBOR(cborData []byte) error {
 func (b *BabbageTransactionBody) Outputs() []TransactionOutput {
 	ret := []TransactionOutput{}
 	for _, output := range b.TxOutputs {
-		ret = append(ret, output)
+		output := output
+		ret = append(ret, &output)
 	}
 	return ret
 }
@@ -214,6 +215,7 @@ func (d *BabbageTransactionOutputDatumOption) MarshalCBOR() ([]byte, error) {
 }
 
 type BabbageTransactionOutput struct {
+	cborData      []byte
 	OutputAddress Address                              `cbor:"0,keyasint,omitempty"`
 	OutputAmount  MaryTransactionOutputValue           `cbor:"1,keyasint,omitempty"`
 	DatumOption   *BabbageTransactionOutputDatumOption `cbor:"2,keyasint,omitempty"`
@@ -222,6 +224,8 @@ type BabbageTransactionOutput struct {
 }
 
 func (o *BabbageTransactionOutput) UnmarshalCBOR(cborData []byte) error {
+	// Save original CBOR
+	o.cborData = cborData[:]
 	// Try to parse as legacy output first
 	var tmpOutput AlonzoTransactionOutput
 	if _, err := cbor.Decode(cborData, &tmpOutput); err == nil {
@@ -258,6 +262,10 @@ func (o BabbageTransactionOutput) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&tmpObj)
 }
 
+func (o *BabbageTransactionOutput) Cbor() []byte {
+	return o.cborData
+}
+
 func (o BabbageTransactionOutput) Address() Address {
 	return o.OutputAddress
 }

ledger/mary.go

@@ -94,7 +94,8 @@ func (b *MaryTransactionBody) UnmarshalCBOR(cborData []byte) error {
 func (b *MaryTransactionBody) Outputs() []TransactionOutput {
 	ret := []TransactionOutput{}
 	for _, output := range b.TxOutputs {
-		ret = append(ret, output)
+		output := output
+		ret = append(ret, &output)
 	}
 	return ret
 }
@@ -125,6 +126,7 @@ func (t MaryTransaction) Metadata() *cbor.Value {
 
 type MaryTransactionOutput struct {
 	cbor.StructAsArray
+	cbor.DecodeStoreCbor
 	OutputAddress Address
 	OutputAmount  MaryTransactionOutputValue
 }

ledger/shelley.go

@@ -163,7 +163,8 @@ func (b *ShelleyTransactionBody) Inputs() []TransactionInput {
 func (b *ShelleyTransactionBody) Outputs() []TransactionOutput {
 	ret := []TransactionOutput{}
 	for _, output := range b.TxOutputs {
-		ret = append(ret, output)
+		output := output
+		ret = append(ret, &output)
 	}
 	return ret
 }
@@ -192,6 +193,7 @@ func (i ShelleyTransactionInput) MarshalJSON() ([]byte, error) {
 
 type ShelleyTransactionOutput struct {
 	cbor.StructAsArray
+	cbor.DecodeStoreCbor
 	OutputAddress Address `json:"address"`
 	OutputAmount  uint64  `json:"amount"`
 }

ledger/tx.go

@@ -45,6 +45,7 @@ type TransactionOutput interface {
 	Assets() *MultiAsset[MultiAssetTypeOutput]
 	Datum() *cbor.LazyValue
 	DatumHash() *Blake2b256
+	Cbor() []byte
 }
 
 func NewTransactionFromCbor(txType uint, data []byte) (Transaction, error) {