Skip to content

refactor: Use common.Script types when returning Plutus scripts from witness set #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

refactor: Use common.Script types when returning Plutus scripts from witness set #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ledger/alonzo/alonzo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down Expand Up @@ -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
}
Expand Down
10 changes: 5 additions & 5 deletions ledger/babbage/babbage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions ledger/common/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
12 changes: 6 additions & 6 deletions ledger/conway/conway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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()
}

Expand Down
6 changes: 3 additions & 3 deletions ledger/shelley/shelley.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down