Skip to content

Commit 7af974d

Browse files
committed
wip
1 parent f75b33f commit 7af974d

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

cabal.project

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ if impl(ghc >=9.14)
164164

165165
-- TEMPORARY: switching to crypton >= 1.1 (which depends on `ram` instead of
166166
-- `memory`) needs cardano-crypto-class-2.6.0.0 (the first version depending
167-
-- on crypton ^>=1.1 and `ram`), but the released ouroboros-consensus-3.0.1.0
168-
-- pins `cardano-crypto-class ^>=2.3`, which excludes it. The blocks below
167+
-- on crypton ^>=1.1 and `ram`), but the released ouroboros-consensus-4.1.0.0
168+
-- pins `cardano-crypto-class ^>=2.5`, which excludes it. The blocks below
169169
-- replicate the (draft, do-not-merge) upstream fix in
170170
-- https://github.com/IntersectMBO/ouroboros-consensus/pull/2213, which widens
171171
-- ouroboros-consensus's bound to also allow cardano-crypto-class-2.6.0.0 and
@@ -184,7 +184,7 @@ allow-newer:
184184
source-repository-package
185185
type: git
186186
location: https://github.com/IntersectMBO/ouroboros-consensus
187-
tag: 4da82e0afed5dabbe930d5f5cad5de687428e07b
187+
tag: 206dffef96e76e42e15a1fb9fd6796394aef3409
188188

189189
-- TEMPORARY: pulls in cardano-base PR #694 (erikd/contra-tracer, not yet
190190
-- merged) https://github.com/IntersectMBO/cardano-base/pull/694, which widens

cardano-api/cardano-api.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ library
132132
bytestring,
133133
bytestring-trie,
134134
cardano-addresses ^>=4.0.0,
135+
cardano-base ^>=0.1,
135136
cardano-binary >=1.9.1,
136137
cardano-crypto,
137138
cardano-crypto-class ^>=2.6,

cardano-api/src/Cardano/Api/Key/Internal/Leios.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ minSigPoPContext = Crypto.minSigPoPDST
210210
-- honest participants' keys during aggregation (a rogue key attack).
211211
createBlsPossessionProof :: SigningKey BlsKey -> BlsPossessionProof
212212
createBlsPossessionProof (BlsSigningKey sk) =
213-
BlsPossessionProof (Crypto.createPossessionProofDSIGN Crypto.minSigPoPDST sk)
213+
BlsPossessionProof (Crypto.createPossessionProofDSIGN minSigPoPContext sk)
214214

215215
instance HasTypeProxy BlsPossessionProof where
216216
data AsType BlsPossessionProof = AsBlsPossessionProof

cardano-rpc/src/Cardano/Rpc/Server/Internal/UtxoRpc/Type/Tx.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ txToUtxoRpcTx ledgerTx = anyEraTxConstraints sbe $ do
138138
defMessage
139139
& U5c.vkey .~ DSIGN.rawEncodeFixedSized bootstrapKey
140140
& U5c.signature .~ DSIGN.rawEncodeFixedSized bootstrapSignature
141-
& U5c.chainCode .~ L.unChainCode (L.bwChainCode bootstrapWitness)
142-
& U5c.attributes .~ L.bwAttributes bootstrapWitness
141+
& U5c.chainCode .~ SBS.fromShort (byteArrayToShortByteString (L.unChainCode (L.bwChainCode bootstrapWitness)))
142+
& U5c.attributes .~ SBS.fromShort (byteArrayToShortByteString (L.bwAttributes bootstrapWitness))
143143
scriptWitnesses :: [Proto UtxoRpc.Script]
144144
scriptWitnesses =
145145
M.elems (wits ^. L.scriptTxWitsL) <&> ledgerScriptToUtxoRpcScript sbe

0 commit comments

Comments
 (0)