File tree Expand file tree Collapse file tree 4 files changed +13
-12
lines changed
balance-tx/lib/internal/Internal/Cardano/Write
customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure
wallet/src/Cardano/Wallet/Shelley Expand file tree Collapse file tree 4 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -410,9 +410,10 @@ instance IsRecentEra ConwayEra where
410410cardanoEraFromRecentEra
411411 :: RecentEra era
412412 -> CardanoApi. CardanoEra (CardanoApiEra era )
413- cardanoEraFromRecentEra =
414- CardanoApi. shelleyBasedToCardanoEra
415- . shelleyBasedEraFromRecentEra
413+ cardanoEraFromRecentEra era = case shelleyBasedEraFromRecentEra era of
414+ CardanoApi. ShelleyBasedEraBabbage -> CardanoApi. toCardanoEra CardanoApi. BabbageEra
415+ CardanoApi. ShelleyBasedEraConway -> CardanoApi. toCardanoEra CardanoApi. ConwayEra
416+ _ -> error " we are expecting only Babbage and Conway"
416417
417418shelleyBasedEraFromRecentEra
418419 :: RecentEra era
Original file line number Diff line number Diff line change @@ -1012,7 +1012,7 @@ genScriptWitnessSpend langEra =
10121012 (PlutusScriptLanguage ver) ->
10131013 PlutusScriptWitness langEra ver
10141014 <$> genPlutusScriptOrReferenceInput ver
1015- <*> (ScriptDatumForTxIn <$> genHashableScriptData)
1015+ <*> (ScriptDatumForTxIn . Just <$> genHashableScriptData)
10161016 <*> genHashableScriptData
10171017 <*> genExecutionUnits
10181018
@@ -1604,7 +1604,7 @@ genTxCertificates era = withEraWitness era $ \sbe ->
16041604 [ pure TxCertificatesNone
16051605 , TxCertificates sbe
16061606 <$> scale (`div` 3 ) (listOf (genTxCertificate era))
1607- <*> ( ( BuildTxWith . Map. fromList)
1607+ <*> ( BuildTxWith
16081608 <$> scale
16091609 (`div` 3 )
16101610 ( listOf
@@ -1780,7 +1780,7 @@ genTxBodyContent era = withEraWitness era $ \sbe -> do
17801780 txValidityUpperBound <- genTxValidityUpperBound era
17811781 txProposalProcedures <- genMaybeFeaturedInEra genProposals era
17821782 txVotingProcedures <- genMaybeFeaturedInEra genVotingProcedures era
1783- txCurrentTreasuryValue <- genMaybeFeaturedInEra (const genCoin) era
1783+ txCurrentTreasuryValue <- genMaybeFeaturedInEra (const ( pure <$> genCoin) ) era
17841784 txTreasuryDonation <- genMaybeFeaturedInEra (const genCoin) era
17851785
17861786 let
Original file line number Diff line number Diff line change @@ -98,8 +98,8 @@ spendTxD tx !u =
9898 where
9999 inputsToExclude =
100100 case Tx. getScriptValidity tx of
101- Tx. IsValid True -> Tx. getInputs tx
102- Tx. IsValid False -> Tx. getCollateralInputs tx
101+ Tx. IsValidC True -> Tx. getInputs tx
102+ Tx. IsValidC False -> Tx. getCollateralInputs tx
103103
104104{- ----------------------------------------------------------------------------
105105 Helpers
Original file line number Diff line number Diff line change @@ -892,8 +892,8 @@ mkUnsignedTx
892892 , Cardano. txCertificates = case stakingScriptM of
893893 Nothing ->
894894 let
895- witMap = Map. empty
896- ctx = Cardano. BuildTxWith witMap
895+ witPair = []
896+ ctx = Cardano. BuildTxWith witPair
897897 in
898898 Cardano. TxCertificates shelleyEra certs ctx
899899 Just stakingScript ->
@@ -907,8 +907,8 @@ mkUnsignedTx
907907 Cardano. ScriptWitness
908908 Cardano. ScriptWitnessForStakeAddr
909909 (toScriptWitness stakingScript)
910- witMap = Map. fromList [(buildKey, buildVal)]
911- ctx = Cardano. BuildTxWith witMap
910+ witPair = [(buildKey, buildVal)]
911+ ctx = Cardano. BuildTxWith witPair
912912 in
913913 Cardano. TxCertificates shelleyEra certs ctx
914914
You can’t perform that action at this time.
0 commit comments