Skip to content

Commit

Permalink
[ADP-3302] Bump compile-time dependencies to match cardano-node-8.9. (#…
Browse files Browse the repository at this point in the history
…4503)

This pull request updates our compile-time dependencies to match those
of cardano-node-8.9.0.

### Issue number

ADP-3302
  • Loading branch information
HeinrichApfelmus authored Mar 25, 2024
2 parents 631810e + 7ea184b commit f88aaf0
Show file tree
Hide file tree
Showing 90 changed files with 1,484 additions and 998 deletions.
23 changes: 12 additions & 11 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
--------------------------------------------------------------------------------

-- Custom repository for cardano haskell packages, see
-- https://github.com/input-output-hk/cardano-haskell-packages
-- https://github.com/intersectmbo/cardano-haskell-packages
-- for more information.
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 @@ -50,11 +50,11 @@ repository cardano-haskell-packages
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

-- repeating the index-state for hackage to work around hackage.nix parsing limitation
index-state: 2024-01-12T11:04:55Z
index-state: 2024-03-19T15:29:53Z

index-state:
, hackage.haskell.org 2024-01-12T11:04:55Z
, cardano-haskell-packages 2023-12-18T12:30:16Z
, hackage.haskell.org 2024-03-19T15:29:53Z
, cardano-haskell-packages 2024-03-15T17:07:52Z

packages:
lib/address-derivation-discovery
Expand Down Expand Up @@ -201,15 +201,16 @@ constraints:
, bech32 == 1.1.3

-- Cardano Node dependencies:
, cardano-api ^>= 8.36.1.1
, cardano-crypto-class ==2.1.4.0
, cardano-node == 8.9.0
, cardano-api ^>=8.39.2.0
, cardano-crypto-class >=2.1.4.0
, cardano-crypto-class +secp256k1-support
, cardano-slotting ^>= 0.1.2
, optparse-applicative-fork == 0.18.1.0
, ouroboros-network ^>= 0.10.2.1
, plutus-core == 1.15.0.1
, optparse-applicative-fork >= 0.18.1
, ouroboros-network ^>= 0.12
, plutus-core ==1.21.0.0
, plutus-core -with-cert -with-inline-r
, plutus-ledger-api ==1.15.0.1
, plutus-ledger-api ==1.21.0.0

-- TH Name shadowing warnings need to be addressed when bumping to 2.13.3.5
, persistent ^>= 2.14.6.0
Expand Down
2 changes: 1 addition & 1 deletion configs/cardano/mainnet/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ByronGenesisFile": "byron-genesis.json",
"ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
"ConwayGenesisFile": "conway-genesis.json",
"ConwayGenesisHash": "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6",
"ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
"EnableP2P": true,
"LastKnownBlockVersion-Alt": 0,
"LastKnownBlockVersion-Major": 3,
Expand Down
39 changes: 20 additions & 19 deletions configs/cardano/mainnet/conway-genesis.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
{
"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": "",
Expand Down
4 changes: 2 additions & 2 deletions configs/cardano/mainnet/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -euo pipefail

curl https://book.play.dev.cardano.org/environments/mainnet/config.json \
> config.json
curl https://book.play.dev.cardano.org/environments/mainnet/genesis.json \
> genesis.json
curl https://book.play.dev.cardano.org/environments/mainnet/conway-genesis.json \
> conway-genesis.json
curl https://book.play.dev.cardano.org/environments/mainnet/topology.json \
> topology.json
curl https://book.play.dev.cardano.org/environments/mainnet/byron-genesis.json \
Expand Down
28 changes: 13 additions & 15 deletions configs/cardano/mainnet/topology.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
{
"bootstrapPeers": [
{
"address": "backbone.cardano.iog.io",
"port": 3001
},
{
"address": "backbone.mainnet.emurgornd.com",
"port": 3001
}
],
"localRoots": [
{
"accessPoints": [],
"advertise": false,
"trustable": false,
"valency": 1
}
],
"publicRoots": [
{
"accessPoints": [
{
"address": "backbone.cardano-mainnet.iohk.io",
"port": 3001
},
{
"address": "backbone.cardano.iog.io",
"port": 3001
},
{
"address": "backbone.mainnet.emurgornd.com",
"port": 3001
}
],
"accessPoints": [],
"advertise": false
}
],
"useLedgerAfterSlot": 110332824
"useLedgerAfterSlot": 116812831
}
2 changes: 1 addition & 1 deletion configs/cardano/preprod/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ByronGenesisFile": "byron-genesis.json",
"ByronGenesisHash": "d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937",
"ConwayGenesisFile": "conway-genesis.json",
"ConwayGenesisHash": "89dd23dc6a020afa0c7521fe52fe14e38d494129933a3604154a3acfa4ac16e4",
"ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
"EnableP2P": true,
"LastKnownBlockVersion-Alt": 0,
"LastKnownBlockVersion-Major": 2,
Expand Down
29 changes: 15 additions & 14 deletions configs/cardano/preprod/conway-genesis.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"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": 200,
Expand Down
16 changes: 9 additions & 7 deletions configs/cardano/preprod/topology.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{
"bootstrapPeers": [
{
"address": "preprod-node.play.dev.cardano.org",
"port": 3001
}
],
"localRoots": [
{
"accessPoints": [],
"advertise": false,
"trustable": false,
"valency": 1
}
],
"publicRoots": [
{
"accessPoints": [
{
"address": "preprod-node.play.dev.cardano.org",
"port": 3001
}
],
"accessPoints": [],
"advertise": false
}
],
"useLedgerAfterSlot": 42855241
"useLedgerAfterSlot": 52358331
}
2 changes: 1 addition & 1 deletion configs/cardano/sanchonet/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ByronGenesisFile": "byron-genesis.json",
"ByronGenesisHash": "785eb88427e136378a15b0a152a8bfbeec7a611529ccda29c43a1e60ffb48eaa",
"ConwayGenesisFile": "conway-genesis.json",
"ConwayGenesisHash": "89dd23dc6a020afa0c7521fe52fe14e38d494129933a3604154a3acfa4ac16e4",
"ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e",
"EnableP2P": true,
"ExperimentalHardForksEnabled": true,
"ExperimentalProtocolsEnabled": true,
Expand Down
29 changes: 15 additions & 14 deletions configs/cardano/sanchonet/conway-genesis.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{
"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": 200,
Expand Down
16 changes: 9 additions & 7 deletions configs/cardano/sanchonet/topology.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{
"bootstrapPeers": [
{
"address": "sanchonet-node.play.dev.cardano.org",
"port": 3001
}
],
"localRoots": [
{
"accessPoints": [],
"advertise": false,
"trustable": false,
"valency": 1
}
],
"publicRoots": [
{
"accessPoints": [
{
"address": "sanchonet-node.play.dev.cardano.org",
"port": 3001
}
],
"accessPoints": [],
"advertise": false
}
],
"useLedgerAfterSlot": 14601600
"useLedgerAfterSlot": 21599922
}
Loading

0 comments on commit f88aaf0

Please sign in to comment.