Skip to content

Commit 2360994

Browse files
authored
fix: Conway witness set optional CBOR set tags (#1083)
Fixes #1082 Signed-off-by: Aurora Gaffney <[email protected]>
1 parent fd809b5 commit 2360994

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

ledger/conway/conway.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ func (r ConwayRedeemers) Value(
215215

216216
type ConwayTransactionWitnessSet struct {
217217
cbor.DecodeStoreCbor
218-
VkeyWitnesses []common.VkeyWitness `cbor:"0,keyasint,omitempty"`
219-
WsNativeScripts []common.NativeScript `cbor:"1,keyasint,omitempty"`
220-
BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
221-
WsPlutusV1Scripts [][]byte `cbor:"3,keyasint,omitempty"`
222-
WsPlutusData []cbor.Value `cbor:"4,keyasint,omitempty"`
223-
WsRedeemers ConwayRedeemers `cbor:"5,keyasint,omitempty"`
224-
WsPlutusV2Scripts [][]byte `cbor:"6,keyasint,omitempty"`
225-
WsPlutusV3Scripts [][]byte `cbor:"7,keyasint,omitempty"`
218+
VkeyWitnesses cbor.SetType[common.VkeyWitness] `cbor:"0,keyasint,omitempty,omitzero"`
219+
WsNativeScripts cbor.SetType[common.NativeScript] `cbor:"1,keyasint,omitempty,omitzero"`
220+
BootstrapWitnesses cbor.SetType[common.BootstrapWitness] `cbor:"2,keyasint,omitempty,omitzero"`
221+
WsPlutusV1Scripts cbor.SetType[[]byte] `cbor:"3,keyasint,omitempty,omitzero"`
222+
WsPlutusData cbor.SetType[cbor.Value] `cbor:"4,keyasint,omitempty,omitzero"`
223+
WsRedeemers ConwayRedeemers `cbor:"5,keyasint,omitempty,omitzero"`
224+
WsPlutusV2Scripts cbor.SetType[[]byte] `cbor:"6,keyasint,omitempty,omitzero"`
225+
WsPlutusV3Scripts cbor.SetType[[]byte] `cbor:"7,keyasint,omitempty,omitzero"`
226226
}
227227

228228
func (w *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
@@ -237,31 +237,31 @@ func (w *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
237237
}
238238

239239
func (w ConwayTransactionWitnessSet) Vkey() []common.VkeyWitness {
240-
return w.VkeyWitnesses
240+
return w.VkeyWitnesses.Items()
241241
}
242242

243243
func (w ConwayTransactionWitnessSet) Bootstrap() []common.BootstrapWitness {
244-
return w.BootstrapWitnesses
244+
return w.BootstrapWitnesses.Items()
245245
}
246246

247247
func (w ConwayTransactionWitnessSet) NativeScripts() []common.NativeScript {
248-
return w.WsNativeScripts
248+
return w.WsNativeScripts.Items()
249249
}
250250

251251
func (w ConwayTransactionWitnessSet) PlutusV1Scripts() [][]byte {
252-
return w.WsPlutusV1Scripts
252+
return w.WsPlutusV1Scripts.Items()
253253
}
254254

255255
func (w ConwayTransactionWitnessSet) PlutusV2Scripts() [][]byte {
256-
return w.WsPlutusV2Scripts
256+
return w.WsPlutusV2Scripts.Items()
257257
}
258258

259259
func (w ConwayTransactionWitnessSet) PlutusV3Scripts() [][]byte {
260-
return w.WsPlutusV3Scripts
260+
return w.WsPlutusV3Scripts.Items()
261261
}
262262

263263
func (w ConwayTransactionWitnessSet) PlutusData() []cbor.Value {
264-
return w.WsPlutusData
264+
return w.WsPlutusData.Items()
265265
}
266266

267267
func (w ConwayTransactionWitnessSet) Redeemers() common.TransactionWitnessRedeemers {

0 commit comments

Comments
 (0)