Skip to content

Commit

Permalink
Merge pull request #830 from input-output-hk/nhenin/sanchonet
Browse files Browse the repository at this point in the history
Conway HF update (cardano-node 8.9.0)
  • Loading branch information
nhenin authored Mar 22, 2024
2 parents afe022a + d6188fc commit 73c62eb
Show file tree
Hide file tree
Showing 81 changed files with 33,316 additions and 27,715 deletions.
File renamed without changes.
30 changes: 13 additions & 17 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repository cardano-haskell-packages
url: https://input-output-hk.github.io/cardano-haskell-packages
url: https://chap.intersectmbo.org/
secure: True
root-keys:
3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
Expand All @@ -14,10 +14,10 @@ repository cardano-haskell-packages
-- We duplicate the hackage index-state first for haskell.nix, even though cabal ignores it.
-- This must always match the hackage index-state on the next line.
-- See https://github.com/input-output-hk/haskell.nix/issues/1869#issuecomment-1449272480
index-state: 2024-02-01T00:00:00Z
index-state: 2024-03-07T07:48:20Z
index-state:
, hackage.haskell.org 2024-02-01T00:00:00Z
, cardano-haskell-packages 2024-02-01T00:00:00Z
, hackage.haskell.org 2024-03-07T07:48:20Z
, cardano-haskell-packages 2024-03-05T10:16:08Z

packages:
async-components
Expand Down Expand Up @@ -194,14 +194,6 @@ source-repository-package
--sha256: sha256-69iE7LrigHTSKJrgq6uGU+U4j+NtBwR4ae18vsLyVvI=
subdir: core

-- These constraints needed for plutus-apps
constraints:
-- 0.3.6.2 switched from cryptonite to crypton, and this causes linker
-- failures when other packages depend on cryptonite.
-- Can be removed when this is resolved: https://github.com/snoyberg/http-client/issues/508
http-client-tls < 0.3.6.2,
ouroboros-network-framework ==0.10.1.0

allow-newer:
primitive,
optparse-applicative
Expand All @@ -222,10 +214,14 @@ source-repository-package
isabelle
--sha256: 1yfbv9bwr71jd2sqfsb5jjq6j5bjfbjpp946fbkhxwwc2npwj0pd


-- Note (by Nicolas Henin) : To remove when using a version > 1.21
-- (this is 1.21 + this commit `Revert IntersectMBO#5677 (More efficient Value.geq and leq)` cherry-picked from 1.22 )
source-repository-package
type: git
location: https://github.com/nhenin/cardano-api
tag: 8a539a8e63d8c410a329e3bc028d8339f32e4c8f
subdir: cardano-api
--sha256: 0r2zi4is8ayjryq80b144zcfl95ylx60gjp9n1qdcr1hcyrm76aj
location: https://github.com/nhenin/plutus
tag: 7bb9f70558c27d58195cf4670aa758a72d4e2319
subdir: plutus-core
plutus-ledger-api
plutus-tx
plutus-tx-plugin
--sha256: 0z4fv2pc0d2rpfivl146pwgq3y5kjxw6w9c8rqi154nab1l3614a
42 changes: 22 additions & 20 deletions configuration/conway-babbage-test-genesis.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
{
"poolVotingThresholds": {
"pvtCommitteeNormal": 0.51,
"pvtCommitteeNoConfidence": 0.51,
"pvtHardForkInitiation": 0.51,
"pvtMotionNoConfidence": 0.51
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"hardForkInitiation": 0.51,
"motionNoConfidence": 0.51,
"ppSecurityGroup": 0.51
},
"dRepVotingThresholds": {
"dvtMotionNoConfidence": 0.51,
"dvtCommitteeNormal": 0.51,
"dvtCommitteeNoConfidence": 0.51,
"dvtUpdateToConstitution": 0.51,
"dvtHardForkInitiation": 0.51,
"dvtPPNetworkGroup": 0.51,
"dvtPPEconomicGroup": 0.51,
"dvtPPTechnicalGroup": 0.51,
"dvtPPGovGroup": 0.51,
"dvtTreasuryWithdrawal": 0.51
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"updateToConstitution": 0.51,
"hardForkInitiation": 0.51,
"ppNetworkGroup": 0.51,
"ppEconomicGroup": 0.51,
"ppTechnicalGroup": 0.51,
"ppGovGroup": 0.51,
"treasuryWithdrawal": 0.51
},
"committeeMinSize": 0,
"committeeMaxTermLength": 60,
"govActionLifetime": 14,
"govActionDeposit": 0,
"dRepDeposit": 0,
"dRepActivity": 0,
"committeeMaxTermLength": 200,
"govActionLifetime": 10,
"govActionDeposit": 1000000000,
"dRepDeposit": 2000000,
"dRepActivity": 20,
"constitution": {
"anchor": {
"url": "",
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
"committee": {
"members": {},
"members": {
},
"quorum": 0
}
}
Loading

0 comments on commit 73c62eb

Please sign in to comment.