refactor: remove embedding in TX witness set types

ledger/alonzo/alonzo.go

@@ -381,20 +381,45 @@ func (r AlonzoRedeemers) Value(
 }
 
 type AlonzoTransactionWitnessSet struct {
-	shelley.ShelleyTransactionWitnessSet
-	WsPlutusV1Scripts [][]byte        `cbor:"3,keyasint,omitempty"`
-	WsPlutusData      []cbor.Value    `cbor:"4,keyasint,omitempty"`
-	WsRedeemers       AlonzoRedeemers `cbor:"5,keyasint,omitempty"`
+	cbor.DecodeStoreCbor
+	VkeyWitnesses      []common.VkeyWitness      `cbor:"0,keyasint,omitempty"`
+	WsNativeScripts    []common.NativeScript     `cbor:"1,keyasint,omitempty"`
+	BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
+	WsPlutusV1Scripts  [][]byte                  `cbor:"3,keyasint,omitempty"`
+	WsPlutusData       []cbor.Value              `cbor:"4,keyasint,omitempty"`
+	WsRedeemers        AlonzoRedeemers           `cbor:"5,keyasint,omitempty"`
 }
 
 func (w *AlonzoTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
 	return w.UnmarshalCbor(cborData, w)
 }
 
+func (w AlonzoTransactionWitnessSet) Vkey() []common.VkeyWitness {
+	return w.VkeyWitnesses
+}
+
+func (w AlonzoTransactionWitnessSet) Bootstrap() []common.BootstrapWitness {
+	return w.BootstrapWitnesses
+}
+
+func (w AlonzoTransactionWitnessSet) NativeScripts() []common.NativeScript {
+	return w.WsNativeScripts
+}
+
 func (w AlonzoTransactionWitnessSet) PlutusV1Scripts() [][]byte {
 	return w.WsPlutusV1Scripts
 }
 
+func (w AlonzoTransactionWitnessSet) PlutusV2Scripts() [][]byte {
+	// No plutus v2 scripts in Alonzo
+	return nil
+}
+
+func (w AlonzoTransactionWitnessSet) PlutusV3Scripts() [][]byte {
+	// No plutus v3 scripts in Alonzo
+	return nil
+}
+
 func (w AlonzoTransactionWitnessSet) PlutusData() []cbor.Value {
 	return w.WsPlutusData
 }

ledger/babbage/babbage.go

@@ -526,18 +526,53 @@ func (o BabbageTransactionOutput) Utxorpc() *utxorpc.TxOutput {
 }
 
 type BabbageTransactionWitnessSet struct {
-	alonzo.AlonzoTransactionWitnessSet
-	WsPlutusV2Scripts [][]byte `cbor:"6,keyasint,omitempty"`
+	cbor.DecodeStoreCbor
+	VkeyWitnesses      []common.VkeyWitness      `cbor:"0,keyasint,omitempty"`
+	WsNativeScripts    []common.NativeScript     `cbor:"1,keyasint,omitempty"`
+	BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
+	WsPlutusV1Scripts  [][]byte                  `cbor:"3,keyasint,omitempty"`
+	WsPlutusData       []cbor.Value              `cbor:"4,keyasint,omitempty"`
+	WsRedeemers        alonzo.AlonzoRedeemers    `cbor:"5,keyasint,omitempty"`
+	WsPlutusV2Scripts  [][]byte                  `cbor:"6,keyasint,omitempty"`
 }
 
 func (w *BabbageTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
 	return w.UnmarshalCbor(cborData, w)
 }
 
+func (w BabbageTransactionWitnessSet) Vkey() []common.VkeyWitness {
+	return w.VkeyWitnesses
+}
+
+func (w BabbageTransactionWitnessSet) Bootstrap() []common.BootstrapWitness {
+	return w.BootstrapWitnesses
+}
+
+func (w BabbageTransactionWitnessSet) NativeScripts() []common.NativeScript {
+	return w.WsNativeScripts
+}
+
+func (w BabbageTransactionWitnessSet) PlutusV1Scripts() [][]byte {
+	return w.WsPlutusV1Scripts
+}
+
 func (w BabbageTransactionWitnessSet) PlutusV2Scripts() [][]byte {
 	return w.WsPlutusV2Scripts
 }
 
+func (w BabbageTransactionWitnessSet) PlutusV3Scripts() [][]byte {
+	// No plutus v3 scripts in Babbage
+	return nil
+}
+
+func (w BabbageTransactionWitnessSet) PlutusData() []cbor.Value {
+	return w.WsPlutusData
+}
+
+func (w BabbageTransactionWitnessSet) Redeemers() common.TransactionWitnessRedeemers {
+	return w.WsRedeemers
+}
+
 type BabbageTransaction struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor

ledger/babbage/babbage_test.go

@@ -17,10 +17,8 @@ package babbage
 import (
 	"testing"
 
-	"github.com/blinklabs-io/gouroboros/ledger/alonzo"
 	"github.com/blinklabs-io/gouroboros/ledger/common"
 	"github.com/blinklabs-io/gouroboros/ledger/mary"
-	"github.com/blinklabs-io/gouroboros/ledger/shelley"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -45,14 +43,10 @@ func TestBabbageBlockTransactions(t *testing.T) {
 			TxTotalCollateral: 1 << i,
 		}
 		b.TransactionWitnessSets[i] = BabbageTransactionWitnessSet{
-			AlonzoTransactionWitnessSet: alonzo.AlonzoTransactionWitnessSet{
-				ShelleyTransactionWitnessSet: shelley.ShelleyTransactionWitnessSet{
-					VkeyWitnesses: []common.VkeyWitness{
-						{
-							Vkey:      append(make([]byte, 31), 1<<i)[:],
-							Signature: append(make([]byte, 63), 1<<i)[:],
-						},
-					},
+			VkeyWitnesses: []common.VkeyWitness{
+				{
+					Vkey:      append(make([]byte, 31), 1<<i)[:],
+					Signature: append(make([]byte, 63), 1<<i)[:],
 				},
 			},
 		}

ledger/babbage/rules_test.go

@@ -968,11 +968,9 @@ func TestUtxoValidateInsufficientCollateral(t *testing.T) {
 			TxFee: testFee,
 		},
 		WitnessSet: babbage.BabbageTransactionWitnessSet{
-			AlonzoTransactionWitnessSet: alonzo.AlonzoTransactionWitnessSet{
-				WsRedeemers: []alonzo.AlonzoRedeemer{
-					// Placeholder entry
-					{},
-				},
+			WsRedeemers: []alonzo.AlonzoRedeemer{
+				// Placeholder entry
+				{},
 			},
 		},
 	}
@@ -1058,11 +1056,9 @@ func TestUtxoValidateCollateralContainsNonAda(t *testing.T) {
 			TxTotalCollateral: testCollateralAmount,
 		},
 		WitnessSet: babbage.BabbageTransactionWitnessSet{
-			AlonzoTransactionWitnessSet: alonzo.AlonzoTransactionWitnessSet{
-				WsRedeemers: []alonzo.AlonzoRedeemer{
-					// Placeholder entry
-					{},
-				},
+			WsRedeemers: []alonzo.AlonzoRedeemer{
+				// Placeholder entry
+				{},
 			},
 		},
 	}
@@ -1224,11 +1220,9 @@ func TestUtxoValidateNoCollateralInputs(t *testing.T) {
 	testTx := &babbage.BabbageTransaction{
 		Body: babbage.BabbageTransactionBody{},
 		WitnessSet: babbage.BabbageTransactionWitnessSet{
-			AlonzoTransactionWitnessSet: alonzo.AlonzoTransactionWitnessSet{
-				WsRedeemers: []alonzo.AlonzoRedeemer{
-					// Placeholder entry
-					{},
-				},
+			WsRedeemers: []alonzo.AlonzoRedeemer{
+				// Placeholder entry
+				{},
 			},
 		},
 	}

ledger/conway/conway.go

@@ -210,19 +210,49 @@ func (r ConwayRedeemers) Value(
 }
 
 type ConwayTransactionWitnessSet struct {
-	babbage.BabbageTransactionWitnessSet
-	WsRedeemers       ConwayRedeemers `cbor:"5,keyasint,omitempty"`
-	WsPlutusV3Scripts [][]byte        `cbor:"7,keyasint,omitempty"`
+	cbor.DecodeStoreCbor
+	VkeyWitnesses      []common.VkeyWitness      `cbor:"0,keyasint,omitempty"`
+	WsNativeScripts    []common.NativeScript     `cbor:"1,keyasint,omitempty"`
+	BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
+	WsPlutusV1Scripts  [][]byte                  `cbor:"3,keyasint,omitempty"`
+	WsPlutusData       []cbor.Value              `cbor:"4,keyasint,omitempty"`
+	WsRedeemers        ConwayRedeemers           `cbor:"5,keyasint,omitempty"`
+	WsPlutusV2Scripts  [][]byte                  `cbor:"6,keyasint,omitempty"`
+	WsPlutusV3Scripts  [][]byte                  `cbor:"7,keyasint,omitempty"`
 }
 
 func (w *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
 	return w.UnmarshalCbor(cborData, w)
 }
 
+func (w ConwayTransactionWitnessSet) Vkey() []common.VkeyWitness {
+	return w.VkeyWitnesses
+}
+
+func (w ConwayTransactionWitnessSet) Bootstrap() []common.BootstrapWitness {
+	return w.BootstrapWitnesses
+}
+
+func (w ConwayTransactionWitnessSet) NativeScripts() []common.NativeScript {
+	return w.WsNativeScripts
+}
+
+func (w ConwayTransactionWitnessSet) PlutusV1Scripts() [][]byte {
+	return w.WsPlutusV1Scripts
+}
+
+func (w ConwayTransactionWitnessSet) PlutusV2Scripts() [][]byte {
+	return w.WsPlutusV2Scripts
+}
+
 func (w ConwayTransactionWitnessSet) PlutusV3Scripts() [][]byte {
 	return w.WsPlutusV3Scripts
 }
 
+func (w ConwayTransactionWitnessSet) PlutusData() []cbor.Value {
+	return w.WsPlutusData
+}
+
 func (w ConwayTransactionWitnessSet) Redeemers() common.TransactionWitnessRedeemers {
 	return w.WsRedeemers
 }