From 56ecf617ba98c6381c85a9458a98351fca8a4ee1 Mon Sep 17 00:00:00 2001
From: Aurora Gaffney <aurora@blinklabs.io>
Date: Thu, 29 Aug 2024 10:59:40 -0500
Subject: [PATCH] fix: merge protocol minor/major Conway protocol params

The protocol major/minor were historically separate fields due to a bug
in the upstream implementation, but it has been fixed for the Conway era
---
 ledger/conway/conway.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/ledger/conway/conway.go b/ledger/conway/conway.go
index 864a4357..a05d5b66 100644
--- a/ledger/conway/conway.go
+++ b/ledger/conway/conway.go
@@ -224,7 +224,33 @@ func (b *ConwayTransactionBody) Donation() uint64 {
 }
 
 type ConwayProtocolParameters struct {
-	babbage.BabbageProtocolParameters
+	cbor.StructAsArray
+	MinFeeA            uint
+	MinFeeB            uint
+	MaxBlockBodySize   uint
+	MaxTxSize          uint
+	MaxBlockHeaderSize uint
+	KeyDeposit         uint
+	PoolDeposit        uint
+	MaxEpoch           uint
+	NOpt               uint
+	A0                 *cbor.Rat
+	Rho                *cbor.Rat
+	Tau                *cbor.Rat
+	Protocol           struct {
+		cbor.StructAsArray
+		Major uint
+		Minor uint
+	}
+	MinPoolCost                uint
+	AdaPerUtxoByte             uint
+	CostModels                 map[uint][]int
+	ExecutionUnitPrices        []*cbor.Rat // [priceMemory priceSteps]
+	MaxTxExecutionUnits        []uint
+	MaxBlockExecutionUnits     []uint
+	MaxValueSize               uint
+	CollateralPercentage       uint
+	MaxCollateralInputs        uint
 	PoolVotingThresholds       PoolVotingThresholds
 	DRepVotingThresholds       DRepVotingThresholds
 	MinCommitteeSize           uint