From f7177b7425175e86f0436889ed5a126d342d0fad Mon Sep 17 00:00:00 2001 From: Johannes Lund Date: Wed, 15 Jan 2025 15:59:40 +0100 Subject: [PATCH 1/2] Fix wallet-e2e preprod config --- .../config/cardano-node/preprod/config.json | 15 +- .../cardano-node/preprod/conway-genesis.json | 331 ++++++++++++++++-- 2 files changed, 307 insertions(+), 39 deletions(-) diff --git a/lib/wallet-e2e/config/cardano-node/preprod/config.json b/lib/wallet-e2e/config/cardano-node/preprod/config.json index a5b283cf61d..563fbde095b 100644 --- a/lib/wallet-e2e/config/cardano-node/preprod/config.json +++ b/lib/wallet-e2e/config/cardano-node/preprod/config.json @@ -1,24 +1,24 @@ { "AlonzoGenesisFile": "alonzo-genesis.json", "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", - "ApplicationName": "cardano-sl", - "ApplicationVersion": 0, "ByronGenesisFile": "byron-genesis.json", "ByronGenesisHash": "d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937", "ConwayGenesisFile": "conway-genesis.json", - "ConwayGenesisHash": "4c14cc9ca7934a59575e57bb1c11954f25299bb5a9cb82b72923522d23b0acd5", + "ConwayGenesisHash": "0eb6adaec3fcb1fe286c1b4ae0da2a117eafc3add51e17577d36dd39eddfc3db", "EnableP2P": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 2, "LastKnownBlockVersion-Minor": 0, + "MinNodeVersion": "8.12.0", + "PeerSharing": true, "Protocol": "Cardano", "RequiresNetworkMagic": "RequiresMagic", "ShelleyGenesisFile": "shelley-genesis.json", "ShelleyGenesisHash": "162d29c4e1cf6b8a84f2d692e67a3ac6bc7851bc3e6e4afe64d15778bed8bd86", "TargetNumberOfActivePeers": 20, "TargetNumberOfEstablishedPeers": 50, - "TargetNumberOfKnownPeers": 100, - "TargetNumberOfRootPeers": 100, + "TargetNumberOfKnownPeers": 150, + "TargetNumberOfRootPeers": 60, "TraceAcceptPolicy": true, "TraceBlockFetchClient": false, "TraceBlockFetchDecisions": false, @@ -36,13 +36,14 @@ "TraceDiffusionInitialization": true, "TraceErrorPolicy": true, "TraceForge": true, - "TraceHandshake": false, + "TraceHandshake": true, "TraceInboundGovernor": true, "TraceIpSubscription": true, "TraceLedgerPeers": true, "TraceLocalChainSyncProtocol": false, + "TraceLocalConnectionManager": true, "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": false, + "TraceLocalHandshake": true, "TraceLocalRootPeers": true, "TraceLocalTxSubmissionProtocol": false, "TraceLocalTxSubmissionServer": false, diff --git a/lib/wallet-e2e/config/cardano-node/preprod/conway-genesis.json b/lib/wallet-e2e/config/cardano-node/preprod/conway-genesis.json index 6f8395db340..09c77b4d33e 100644 --- a/lib/wallet-e2e/config/cardano-node/preprod/conway-genesis.json +++ b/lib/wallet-e2e/config/cardano-node/preprod/conway-genesis.json @@ -1,36 +1,303 @@ { - "poolVotingThresholds": { - "pvtCommitteeNormal": 0.51, - "pvtCommitteeNoConfidence": 0.51, - "pvtHardForkInitiation": 0.51, - "pvtMotionNoConfidence": 0.51 + "poolVotingThresholds": { + "committeeNormal": 0.51, + "committeeNoConfidence": 0.51, + "hardForkInitiation": 0.51, + "motionNoConfidence": 0.51, + "ppSecurityGroup": 0.51 + }, + "dRepVotingThresholds": { + "motionNoConfidence": 0.67, + "committeeNormal": 0.67, + "committeeNoConfidence": 0.6, + "updateToConstitution": 0.75, + "hardForkInitiation": 0.6, + "ppNetworkGroup": 0.67, + "ppEconomicGroup": 0.67, + "ppTechnicalGroup": 0.67, + "ppGovGroup": 0.75, + "treasuryWithdrawal": 0.67 + }, + "committeeMinSize": 7, + "committeeMaxTermLength": 146, + "govActionLifetime": 6, + "govActionDeposit": 100000000000, + "dRepDeposit": 500000000, + "dRepActivity": 20, + "minFeeRefScriptCostPerByte": 15, + "plutusV3CostModel": [ + 100788, + 420, + 1, + 1, + 1000, + 173, + 0, + 1, + 1000, + 59957, + 4, + 1, + 11183, + 32, + 201305, + 8356, + 4, + 16000, + 100, + 16000, + 100, + 16000, + 100, + 16000, + 100, + 16000, + 100, + 16000, + 100, + 100, + 100, + 16000, + 100, + 94375, + 32, + 132994, + 32, + 61462, + 4, + 72010, + 178, + 0, + 1, + 22151, + 32, + 91189, + 769, + 4, + 2, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, + 0, + 1, + 1, + 1000, + 42921, + 4, + 2, + 24548, + 29498, + 38, + 1, + 898148, + 27279, + 1, + 51775, + 558, + 1, + 39184, + 1000, + 60594, + 1, + 141895, + 32, + 83150, + 32, + 15299, + 32, + 76049, + 1, + 13169, + 4, + 22100, + 10, + 28999, + 74, + 1, + 28999, + 74, + 1, + 43285, + 552, + 1, + 44749, + 541, + 1, + 33852, + 32, + 68246, + 32, + 72362, + 32, + 7243, + 32, + 7391, + 32, + 11546, + 32, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, + 0, + 1, + 90434, + 519, + 0, + 1, + 74433, + 32, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, + 0, + 1, + 1, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, + 0, + 1, + 955506, + 213312, + 0, + 2, + 270652, + 22588, + 4, + 1457325, + 64566, + 4, + 20467, + 1, + 4, + 0, + 141992, + 32, + 100788, + 420, + 1, + 1, + 81663, + 32, + 59498, + 32, + 20142, + 32, + 24588, + 32, + 20744, + 32, + 25933, + 32, + 24623, + 32, + 43053543, + 10, + 53384111, + 14333, + 10, + 43574283, + 26308, + 10, + 16000, + 100, + 16000, + 100, + 962335, + 18, + 2780678, + 6, + 442008, + 1, + 52538055, + 3756, + 18, + 267929, + 18, + 76433006, + 8868, + 18, + 52948122, + 18, + 1995836, + 36, + 3227919, + 12, + 901022, + 1, + 166917843, + 4307, + 36, + 284546, + 36, + 158221314, + 26549, + 36, + 74698472, + 36, + 333849714, + 1, + 254006273, + 72, + 2174038, + 72, + 2261318, + 64571, + 4, + 207616, + 8310, + 4, + 1293828, + 28716, + 63, + 0, + 1, + 1006041, + 43623, + 251, + 0, + 1 + ], + "constitution": { + "anchor": { + "dataHash": "ca41a91f399259bcefe57f9858e91f6d00e1a38d6d9c63d4052914ea7bd70cb2", + "url": "ipfs://bafkreifnwj6zpu3ixa4siz2lndqybyc5wnnt3jkwyutci4e2tmbnj3xrdm" + }, + "script": "fa24fb305126805cf2164c161d852a0e7330cf988f1fe558cf7d4a64" + }, + "committee": { + "members": { + "scriptHash-a6a5e006fd4e8f51062dc431362369b2a43140abced8aa2ff2256d7b": 229, + "scriptHash-6095e643ea6f1cccb6e463ec34349026b3a48621aac5d512655ab1bf": 229, + "scriptHash-94c0de47e7ae32e3f7234ada5cf976506b68e3bb88c54dc53b4ba984": 229, + "scriptHash-5098dfd0deba725fadd692198fc33ee959fbe7e6edf1b5a695e06e61": 229, + "scriptHash-5a71f17f4ce4c1c0be053575d717ade6ad8a1d5453d02a65ce40d4b1": 229, + "scriptHash-2f4a6c6f098e20ee4bfd5b39942c164575f8ceb348e754df5d0ec04f": 229, + "scriptHash-94f51c795a6c11adb9c1e30f0b6def4230cbd0b8bc800098e2d2307b": 229 }, - "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 - }, - "committeeMinSize": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, - "dRepActivity": 20, - "constitution": { - "anchor": { - "url": "", - "dataHash": "0000000000000000000000000000000000000000000000000000000000000000" - } - }, - "committee": { - "members": {}, - "quorum": 0 + "threshold": { + "numerator": 2, + "denominator": 3 } + } } From 57cd11159e2f6e54147916fe286ac619812ff3e5 Mon Sep 17 00:00:00 2001 From: Johannes Lund Date: Wed, 15 Jan 2025 16:10:46 +0100 Subject: [PATCH 2/2] Fix `just e2e-preprod` command Ensure cardano-wallet executable is in path --- justfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 772c3e646b5..a377881f26c 100644 --- a/justfile +++ b/justfile @@ -74,7 +74,9 @@ unit-tests-cabal: # run wallet-e2e suite against the preprod network e2e-preprod: - nix run '.#cardano-wallet-e2e' -- preprod \ + nix shell \ + '.#cardano-node' '.#cardano-wallet' '.#cardano-wallet-e2e' \ + -c wallet-e2e preprod \ -s lib/wallet-e2e/test-state/preprod \ -c lib/wallet-e2e/config/cardano-node/preprod \ -t lib/wallet-e2e/test-output/preprod