refactor: Use common.Script types instead of []byte for Plutus scripts in Transaction witness set (#1157)

arepala-uml · web-flow · commit c2f0186de36b · 2025-08-25T14:43:14.000-04:00
Signed-off-by: Akhil Repala &lt;arepala@blinklabs.io&gt;
diff --git a/ledger/alonzo/alonzo.go b/ledger/alonzo/alonzo.go
@@ -521,7 +521,7 @@ type AlonzoTransactionWitnessSet struct {
 	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"`
+	WsPlutusV1Scripts  []common.PlutusV1Script   `cbor:"3,keyasint,omitempty"`
 	WsPlutusData       []common.Datum            `cbor:"4,keyasint,omitempty"`
 	WsRedeemers        AlonzoRedeemers           `cbor:"5,keyasint,omitempty"`
 }
@@ -549,16 +549,16 @@ func (w AlonzoTransactionWitnessSet) NativeScripts() []common.NativeScript {
 	return w.WsNativeScripts
 }
 
-func (w AlonzoTransactionWitnessSet) PlutusV1Scripts() [][]byte {
+func (w AlonzoTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {
 	return w.WsPlutusV1Scripts
 }
 
-func (w AlonzoTransactionWitnessSet) PlutusV2Scripts() [][]byte {
+func (w AlonzoTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {
 	// No plutus v2 scripts in Alonzo
 	return nil
 }
 
-func (w AlonzoTransactionWitnessSet) PlutusV3Scripts() [][]byte {
+func (w AlonzoTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {
 	// No plutus v3 scripts in Alonzo
 	return nil
 }
diff --git a/ledger/babbage/babbage.go b/ledger/babbage/babbage.go
@@ -654,10 +654,10 @@ type BabbageTransactionWitnessSet struct {
 	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"`
+	WsPlutusV1Scripts  []common.PlutusV1Script   `cbor:"3,keyasint,omitempty"`
 	WsPlutusData       []common.Datum            `cbor:"4,keyasint,omitempty"`
 	WsRedeemers        alonzo.AlonzoRedeemers    `cbor:"5,keyasint,omitempty"`
-	WsPlutusV2Scripts  [][]byte                  `cbor:"6,keyasint,omitempty"`
+	WsPlutusV2Scripts  []common.PlutusV2Script   `cbor:"6,keyasint,omitempty"`
 }
 
 func (w *BabbageTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
@@ -683,15 +683,15 @@ func (w BabbageTransactionWitnessSet) NativeScripts() []common.NativeScript {
 	return w.WsNativeScripts
 }
 
-func (w BabbageTransactionWitnessSet) PlutusV1Scripts() [][]byte {
+func (w BabbageTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {
 	return w.WsPlutusV1Scripts
 }
 
-func (w BabbageTransactionWitnessSet) PlutusV2Scripts() [][]byte {
+func (w BabbageTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {
 	return w.WsPlutusV2Scripts
 }
 
-func (w BabbageTransactionWitnessSet) PlutusV3Scripts() [][]byte {
+func (w BabbageTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {
 	// No plutus v3 scripts in Babbage
 	return nil
 }
diff --git a/ledger/common/tx.go b/ledger/common/tx.go
@@ -84,9 +84,9 @@ type TransactionWitnessSet interface {
 	NativeScripts() []NativeScript
 	Bootstrap() []BootstrapWitness
 	PlutusData() []Datum
-	PlutusV1Scripts() [][]byte
-	PlutusV2Scripts() [][]byte
-	PlutusV3Scripts() [][]byte
+	PlutusV1Scripts() []PlutusV1Script
+	PlutusV2Scripts() []PlutusV2Script
+	PlutusV3Scripts() []PlutusV3Script
 	Redeemers() TransactionWitnessRedeemers
 }
 
diff --git a/ledger/conway/conway.go b/ledger/conway/conway.go
@@ -242,11 +242,11 @@ type ConwayTransactionWitnessSet struct {
 	VkeyWitnesses      cbor.SetType[common.VkeyWitness]      `cbor:"0,keyasint,omitempty,omitzero"`
 	WsNativeScripts    cbor.SetType[common.NativeScript]     `cbor:"1,keyasint,omitempty,omitzero"`
 	BootstrapWitnesses cbor.SetType[common.BootstrapWitness] `cbor:"2,keyasint,omitempty,omitzero"`
-	WsPlutusV1Scripts  cbor.SetType[[]byte]                  `cbor:"3,keyasint,omitempty,omitzero"`
+	WsPlutusV1Scripts  cbor.SetType[common.PlutusV1Script]   `cbor:"3,keyasint,omitempty,omitzero"`
 	WsPlutusData       cbor.SetType[common.Datum]            `cbor:"4,keyasint,omitempty,omitzero"`
 	WsRedeemers        ConwayRedeemers                       `cbor:"5,keyasint,omitempty,omitzero"`
-	WsPlutusV2Scripts  cbor.SetType[[]byte]                  `cbor:"6,keyasint,omitempty,omitzero"`
-	WsPlutusV3Scripts  cbor.SetType[[]byte]                  `cbor:"7,keyasint,omitempty,omitzero"`
+	WsPlutusV2Scripts  cbor.SetType[common.PlutusV2Script]   `cbor:"6,keyasint,omitempty,omitzero"`
+	WsPlutusV3Scripts  cbor.SetType[common.PlutusV3Script]   `cbor:"7,keyasint,omitempty,omitzero"`
 }
 
 func (w *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
@@ -272,15 +272,15 @@ func (w ConwayTransactionWitnessSet) NativeScripts() []common.NativeScript {
 	return w.WsNativeScripts.Items()
 }
 
-func (w ConwayTransactionWitnessSet) PlutusV1Scripts() [][]byte {
+func (w ConwayTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {
 	return w.WsPlutusV1Scripts.Items()
 }
 
-func (w ConwayTransactionWitnessSet) PlutusV2Scripts() [][]byte {
+func (w ConwayTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {
 	return w.WsPlutusV2Scripts.Items()
 }
 
-func (w ConwayTransactionWitnessSet) PlutusV3Scripts() [][]byte {
+func (w ConwayTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {
 	return w.WsPlutusV3Scripts.Items()
 }
 
diff --git a/ledger/shelley/shelley.go b/ledger/shelley/shelley.go
@@ -479,17 +479,17 @@ func (w ShelleyTransactionWitnessSet) PlutusData() []common.Datum {
 	return nil
 }
 
-func (w ShelleyTransactionWitnessSet) PlutusV1Scripts() [][]byte {
+func (w ShelleyTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {
 	// No plutus v1 scripts in Shelley
 	return nil
 }
 
-func (w ShelleyTransactionWitnessSet) PlutusV2Scripts() [][]byte {
+func (w ShelleyTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {
 	// No plutus v2 scripts in Shelley
 	return nil
 }
 
-func (w ShelleyTransactionWitnessSet) PlutusV3Scripts() [][]byte {
+func (w ShelleyTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {
 	// No plutus v3 scripts in Shelley
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ type AlonzoTransactionWitnessSet struct {`
`521`	`521`	VkeyWitnesses []common.VkeyWitness `cbor:"0,keyasint,omitempty"`
`522`	`522`	WsNativeScripts []common.NativeScript `cbor:"1,keyasint,omitempty"`
`523`	`523`	BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
`524`		- WsPlutusV1Scripts [][]byte `cbor:"3,keyasint,omitempty"`
	`524`	+ WsPlutusV1Scripts []common.PlutusV1Script `cbor:"3,keyasint,omitempty"`
`525`	`525`	WsPlutusData []common.Datum `cbor:"4,keyasint,omitempty"`
`526`	`526`	WsRedeemers AlonzoRedeemers `cbor:"5,keyasint,omitempty"`
`527`	`527`	`}`
`@@ -549,16 +549,16 @@ func (w AlonzoTransactionWitnessSet) NativeScripts() []common.NativeScript {`
`549`	`549`	`return w.WsNativeScripts`
`550`	`550`	`}`
`551`	`551`
`552`		`-func (w AlonzoTransactionWitnessSet) PlutusV1Scripts() [][]byte {`
	`552`	`+func (w AlonzoTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {`
`553`	`553`	`return w.WsPlutusV1Scripts`
`554`	`554`	`}`
`555`	`555`
`556`		`-func (w AlonzoTransactionWitnessSet) PlutusV2Scripts() [][]byte {`
	`556`	`+func (w AlonzoTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {`
`557`	`557`	`// No plutus v2 scripts in Alonzo`
`558`	`558`	`return nil`
`559`	`559`	`}`
`560`	`560`
`561`		`-func (w AlonzoTransactionWitnessSet) PlutusV3Scripts() [][]byte {`
	`561`	`+func (w AlonzoTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {`
`562`	`562`	`// No plutus v3 scripts in Alonzo`
`563`	`563`	`return nil`
`564`	`564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -654,10 +654,10 @@ type BabbageTransactionWitnessSet struct {`
`654`	`654`	VkeyWitnesses []common.VkeyWitness `cbor:"0,keyasint,omitempty"`
`655`	`655`	WsNativeScripts []common.NativeScript `cbor:"1,keyasint,omitempty"`
`656`	`656`	BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
`657`		- WsPlutusV1Scripts [][]byte `cbor:"3,keyasint,omitempty"`
	`657`	+ WsPlutusV1Scripts []common.PlutusV1Script `cbor:"3,keyasint,omitempty"`
`658`	`658`	WsPlutusData []common.Datum `cbor:"4,keyasint,omitempty"`
`659`	`659`	WsRedeemers alonzo.AlonzoRedeemers `cbor:"5,keyasint,omitempty"`
`660`		- WsPlutusV2Scripts [][]byte `cbor:"6,keyasint,omitempty"`
	`660`	+ WsPlutusV2Scripts []common.PlutusV2Script `cbor:"6,keyasint,omitempty"`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`func (w *BabbageTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {`
`@@ -683,15 +683,15 @@ func (w BabbageTransactionWitnessSet) NativeScripts() []common.NativeScript {`
`683`	`683`	`return w.WsNativeScripts`
`684`	`684`	`}`
`685`	`685`
`686`		`-func (w BabbageTransactionWitnessSet) PlutusV1Scripts() [][]byte {`
	`686`	`+func (w BabbageTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {`
`687`	`687`	`return w.WsPlutusV1Scripts`
`688`	`688`	`}`
`689`	`689`
`690`		`-func (w BabbageTransactionWitnessSet) PlutusV2Scripts() [][]byte {`
	`690`	`+func (w BabbageTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {`
`691`	`691`	`return w.WsPlutusV2Scripts`
`692`	`692`	`}`
`693`	`693`
`694`		`-func (w BabbageTransactionWitnessSet) PlutusV3Scripts() [][]byte {`
	`694`	`+func (w BabbageTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {`
`695`	`695`	`// No plutus v3 scripts in Babbage`
`696`	`696`	`return nil`
`697`	`697`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,11 +242,11 @@ type ConwayTransactionWitnessSet struct {`
`242`	`242`	VkeyWitnesses cbor.SetType[common.VkeyWitness] `cbor:"0,keyasint,omitempty,omitzero"`
`243`	`243`	WsNativeScripts cbor.SetType[common.NativeScript] `cbor:"1,keyasint,omitempty,omitzero"`
`244`	`244`	BootstrapWitnesses cbor.SetType[common.BootstrapWitness] `cbor:"2,keyasint,omitempty,omitzero"`
`245`		- WsPlutusV1Scripts cbor.SetType[[]byte] `cbor:"3,keyasint,omitempty,omitzero"`
	`245`	+ WsPlutusV1Scripts cbor.SetType[common.PlutusV1Script] `cbor:"3,keyasint,omitempty,omitzero"`
`246`	`246`	WsPlutusData cbor.SetType[common.Datum] `cbor:"4,keyasint,omitempty,omitzero"`
`247`	`247`	WsRedeemers ConwayRedeemers `cbor:"5,keyasint,omitempty,omitzero"`
`248`		- WsPlutusV2Scripts cbor.SetType[[]byte] `cbor:"6,keyasint,omitempty,omitzero"`
`249`		- WsPlutusV3Scripts cbor.SetType[[]byte] `cbor:"7,keyasint,omitempty,omitzero"`
	`248`	+ WsPlutusV2Scripts cbor.SetType[common.PlutusV2Script] `cbor:"6,keyasint,omitempty,omitzero"`
	`249`	+ WsPlutusV3Scripts cbor.SetType[common.PlutusV3Script] `cbor:"7,keyasint,omitempty,omitzero"`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`func (w *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {`
`@@ -272,15 +272,15 @@ func (w ConwayTransactionWitnessSet) NativeScripts() []common.NativeScript {`
`272`	`272`	`return w.WsNativeScripts.Items()`
`273`	`273`	`}`
`274`	`274`
`275`		`-func (w ConwayTransactionWitnessSet) PlutusV1Scripts() [][]byte {`
	`275`	`+func (w ConwayTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {`
`276`	`276`	`return w.WsPlutusV1Scripts.Items()`
`277`	`277`	`}`
`278`	`278`
`279`		`-func (w ConwayTransactionWitnessSet) PlutusV2Scripts() [][]byte {`
	`279`	`+func (w ConwayTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {`
`280`	`280`	`return w.WsPlutusV2Scripts.Items()`
`281`	`281`	`}`
`282`	`282`
`283`		`-func (w ConwayTransactionWitnessSet) PlutusV3Scripts() [][]byte {`
	`283`	`+func (w ConwayTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {`
`284`	`284`	`return w.WsPlutusV3Scripts.Items()`
`285`	`285`	`}`
`286`	`286`
Original file line number	Diff line number	Diff line change
`@@ -479,17 +479,17 @@ func (w ShelleyTransactionWitnessSet) PlutusData() []common.Datum {`
`479`	`479`	`return nil`
`480`	`480`	`}`
`481`	`481`
`482`		`-func (w ShelleyTransactionWitnessSet) PlutusV1Scripts() [][]byte {`
	`482`	`+func (w ShelleyTransactionWitnessSet) PlutusV1Scripts() []common.PlutusV1Script {`
`483`	`483`	`// No plutus v1 scripts in Shelley`
`484`	`484`	`return nil`
`485`	`485`	`}`
`486`	`486`
`487`		`-func (w ShelleyTransactionWitnessSet) PlutusV2Scripts() [][]byte {`
	`487`	`+func (w ShelleyTransactionWitnessSet) PlutusV2Scripts() []common.PlutusV2Script {`
`488`	`488`	`// No plutus v2 scripts in Shelley`
`489`	`489`	`return nil`
`490`	`490`	`}`
`491`	`491`
`492`		`-func (w ShelleyTransactionWitnessSet) PlutusV3Scripts() [][]byte {`
	`492`	`+func (w ShelleyTransactionWitnessSet) PlutusV3Scripts() []common.PlutusV3Script {`
`493`	`493`	`// No plutus v3 scripts in Shelley`
`494`	`494`	`return nil`
`495`	`495`	`}`