Skip to content
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.

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

update dependencies for node 8.12 #788

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 65 additions & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ repository cardano-haskell-packages
-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2024-06-12T10:10:17Z
, cardano-haskell-packages 2024-06-12T10:10:17Z
, hackage.haskell.org 2024-06-13T08:49:27Z
, cardano-haskell-packages 2024-06-12T11:52:25Z

packages:
cardano-cli
Expand All @@ -31,10 +31,6 @@ package bitvec
-- Workaround for windows cross-compilation
flags: -simd

constraints:
-- io-classes-mtl-0.1.2.0 is not buildable
io-classes-mtl < 0.1.2.0

tests: True

test-show-details: direct
Expand All @@ -45,3 +41,66 @@ write-ghc-environment-files: always
-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.


source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-consensus
tag: ead2494e080664b39360225fac8f4e6d921ebd93
--sha256: sha256-+M3kmlkaB0ssQoNQG2iLxcuYSTv8AzTxtvZdOpaViss=
subdir:
ouroboros-consensus
ouroboros-consensus-cardano
ouroboros-consensus-diffusion
ouroboros-consensus-protocol

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-ledger
tag: b1eedacfc60c5c2d215d4d8b27f6ac6a45e57f78
--sha256: sha256-eNZno0XuQVlgdxJmM9NXlADp2IrbAajmLDaDje5jMC0=
subdir:
eras/alonzo/impl
eras/alonzo/test-suite
eras/allegra/impl
eras/babbage/impl
eras/babbage/test-suite
eras/byron/chain/executable-spec
eras/byron/crypto
eras/byron/crypto/test
eras/byron/ledger/executable-spec
eras/byron/ledger/impl
eras/byron/ledger/impl/test
eras/conway/impl
eras/conway/test-suite
eras/mary/impl
eras/shelley-ma/test-suite
eras/shelley/impl
eras/shelley/test-suite
libs/cardano-data
libs/cardano-ledger-api
libs/cardano-ledger-binary
libs/cardano-ledger-core
libs/cardano-protocol-tpraos
libs/non-integral
libs/set-algebra
libs/small-steps
libs/vector-map

source-repository-package
type: git
location: https://github.com/IntersectMBO/plutus
tag: 5dffbd7fe2bf6b030d5c3c945886a38be5a09b35
--sha256: sha256-8L926zcs3BpzniLQ2pi1YNDry266I/54lbm1ebkWp4M=
subdir:
plutus-core
plutus-ledger-api
plutus-tx

source-repository-package
type: git
location: https://github.com/IntersectMBO/cardano-api
tag: 5a2cac07c0cfafda016a045f843816f834aeb257
--sha256: sha256-cfHNDUm8cBaXRnj98Vrp79HSel69mOlQgGxjmFGUwRQ=
subdir:
cardano-api
6 changes: 3 additions & 3 deletions cardano-cli/cardano-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,12 @@ library
, microlens
, network
, optparse-applicative-fork
, ouroboros-consensus >= 0.17
, ouroboros-consensus >= 0.18
-- TODO: bump consensus back
, ouroboros-consensus-cardano >= 0.15
, ouroboros-consensus-cardano >= 0.16
, ouroboros-consensus-protocol >= 0.9
, ouroboros-network-api
, ouroboros-network-protocols ^>=0.8
, ouroboros-network-protocols ^>=0.9
, parsec
, prettyprinter
, prettyprinter-ansi-terminal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ data GovernanceActionUpdateCommitteeCmdArgs era
, oldCommitteeVkeySource :: ![VerificationKeyOrHashOrFileOrScriptHash CommitteeColdKey]
, newCommitteeVkeySource :: ![(VerificationKeyOrHashOrFileOrScriptHash CommitteeColdKey, EpochNo)]
, requiredThreshold :: !Rational
, mPrevGovernanceActionId :: !(Maybe (TxId, Word32))
, mPrevGovernanceActionId :: !(Maybe (TxId, Word16))
, outFile :: !(File () Out)
} deriving Show

Expand All @@ -64,7 +64,7 @@ data GovernanceActionCreateConstitutionCmdArgs era
, networkId :: !L.Network
, deposit :: !L.Coin
, stakeCredential :: !StakeIdentifier
, mPrevGovernanceActionId :: !(Maybe (TxId, Word32))
, mPrevGovernanceActionId :: !(Maybe (TxId, Word16))
, proposalUrl :: !ProposalUrl
, proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData)
, constitutionUrl :: !ConstitutionUrl
Expand Down Expand Up @@ -93,7 +93,7 @@ data GovernanceActionCreateNoConfidenceCmdArgs era
, returnStakeAddress :: !StakeIdentifier
, proposalUrl :: !ProposalUrl
, proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData)
, mPrevGovernanceActionId :: !(Maybe (TxId, Word32))
, mPrevGovernanceActionId :: !(Maybe (TxId, Word16))
, outFile :: !(File () Out)
} deriving Show

Expand Down Expand Up @@ -133,7 +133,7 @@ data GovernanceActionHardforkInitCmdArgs era
, networkId :: !L.Network
, deposit :: !L.Coin
, returnStakeAddress :: !StakeIdentifier
, mPrevGovernanceActionId :: !(Maybe (TxId, Word32))
, mPrevGovernanceActionId :: !(Maybe (TxId, Word16))
, proposalUrl :: !ProposalUrl
, proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData)
, protVer :: !L.ProtVer
Expand All @@ -156,7 +156,7 @@ data UpdateProtocolParametersConwayOnwards era
, returnAddr :: !StakeIdentifier
, proposalUrl :: !ProposalUrl
, proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData)
, governanceActionId :: !(Maybe (TxId, Word32))
, governanceActionId :: !(Maybe (TxId, Word16))
, constitutionScriptHash :: !(Maybe ScriptHash)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data GovernanceVoteCreateCmdArgs era
= GovernanceVoteCreateCmdArgs
{ eon :: ConwayEraOnwards era
, voteChoice :: Vote
, governanceAction :: (TxId, Word32)
, governanceAction :: (TxId, Word16)
, votingStakeCredentialSource :: AnyVotingStakeVerificationKeyOrHashOrFile
, mAnchor :: Maybe (VoteUrl, L.SafeHash L.StandardCrypto L.AnchorData)
, outFile :: VoteFile Out
Expand Down
16 changes: 12 additions & 4 deletions cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3284,15 +3284,15 @@ pAnchorDataHash =
, Opt.help "Proposal anchor data hash (obtain it with \"cardano-cli conway governance hash anchor-data ...\")"
]

pPreviousGovernanceAction :: Parser (Maybe (TxId, Word32))
pPreviousGovernanceAction :: Parser (Maybe (TxId, Word16))
pPreviousGovernanceAction = optional $
(,) <$> pTxId "prev-governance-action-tx-id" "Txid of the previous governance action."
<*> pWord32 "prev-governance-action-index" "Action index of the previous governance action."
<*> pWord16 "prev-governance-action-index" "Action index of the previous governance action."

pGovernanceActionId :: Parser (TxId, Word32)
pGovernanceActionId :: Parser (TxId, Word16)
pGovernanceActionId =
(,) <$> pTxId "governance-action-tx-id" "Txid of the governance action."
<*> pWord32 "governance-action-index" "Tx's governance action index."
<*> pWord16 "governance-action-index" "Tx's governance action index."

pWord32 :: String -> String -> Parser Word32
pWord32 l h =
Expand All @@ -3302,6 +3302,14 @@ pWord32 l h =
, Opt.help h
]

pWord16 :: String -> String -> Parser Word16
pWord16 l h =
Opt.option auto $ mconcat
[ Opt.long l
, Opt.metavar "WORD16"
, Opt.help h
]

pTxId :: String -> String -> Parser TxId
pTxId l h =
Opt.option (readerFromParsecParser parseTxId) $ mconcat
Expand Down
2 changes: 1 addition & 1 deletion cardano-cli/src/Cardano/CLI/Types/Governance.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ data ConwayVote
= ConwayVote
{ cvVoteChoice :: Vote
, cvVoterType :: VType
, cvGovActionId :: (TxId, Word32)
, cvGovActionId :: (TxId, Word16)
, cvVotingStakeCredential :: VerificationKeyOrFile StakePoolKey
, cvEra :: AnyShelleyBasedEra
, cvFilepath :: VoteFile Out
Expand Down
36 changes: 18 additions & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading