diff --git a/README.md b/README.md index a739b129542..90133f69ae3 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ Or modify the `docker-compose.yml` to host your client in the `mainnet_default` ### Running on preprod -Preprod network is broken for node 9.0.0 at some block in the past. +Preprod network is broken for node 9.1.0 at some block in the past. One way to overcome that limitation is to download a snapshot that used an old version node (1.35.2) to trespass that point. Use `snpashot.sh` to download the snapshot. diff --git a/configs/cardano/mainnet/config.json b/configs/cardano/mainnet/config.json index dade1c2848f..78e331e4988 100644 --- a/configs/cardano/mainnet/config.json +++ b/configs/cardano/mainnet/config.json @@ -3,6 +3,8 @@ "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", "ByronGenesisFile": "byron-genesis.json", "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb", + "ConwayGenesisFile": "conway-genesis.json", + "ConwayGenesisHash": "15a199f895e461ec0ffc6dd4e4028af28a492ab4e806d39cb674c88f7643ef62", "EnableP2P": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, diff --git a/configs/cardano/mainnet/conway-genesis.json b/configs/cardano/mainnet/conway-genesis.json new file mode 100644 index 00000000000..760995a34d4 --- /dev/null +++ b/configs/cardano/mainnet/conway-genesis.json @@ -0,0 +1,303 @@ +{ + "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-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": 580, + "scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": 580, + "scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": 580, + "scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": 580, + "scriptHash-349e55f83e9af24813e6cb368df6a80d38951b2a334dfcdf26815558": 580, + "scriptHash-84aebcfd3e00d0f87af918fc4b5e00135f407e379893df7e7d392c6a": 580, + "scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": 580 + }, + "threshold": { + "numerator": 2, + "denominator": 3 + } + } +} diff --git a/configs/cardano/mainnet/download.sh b/configs/cardano/mainnet/download.sh index aea7b3d2baa..1e8062bbfb1 100755 --- a/configs/cardano/mainnet/download.sh +++ b/configs/cardano/mainnet/download.sh @@ -3,9 +3,9 @@ set -euo pipefail rm ./*.json -curl https://book.play.dev.cardano.org/environments-pre/mainnet/config.json > config.json -curl https://book.play.dev.cardano.org/environments-pre/mainnet/conway-genesis.json > conway-genesis.json -curl https://book.play.dev.cardano.org/environments-pre/mainnet/topology.json > topology.json -curl https://book.play.dev.cardano.org/environments-pre/mainnet/byron-genesis.json > byron-genesis.json -curl https://book.play.dev.cardano.org/environments-pre/mainnet/shelley-genesis.json > shelley-genesis.json -curl https://book.play.dev.cardano.org/environments-pre/mainnet/alonzo-genesis.json > alonzo-genesis.json +curl https://book.play.dev.cardano.org/environments/mainnet/config.json > config.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 > byron-genesis.json +curl https://book.play.dev.cardano.org/environments/mainnet/shelley-genesis.json > shelley-genesis.json +curl https://book.play.dev.cardano.org/environments/mainnet/alonzo-genesis.json > alonzo-genesis.json diff --git a/configs/cardano/preprod/config.json b/configs/cardano/preprod/config.json index ec2b280c407..563fbde095b 100644 --- a/configs/cardano/preprod/config.json +++ b/configs/cardano/preprod/config.json @@ -3,6 +3,8 @@ "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", "ByronGenesisFile": "byron-genesis.json", "ByronGenesisHash": "d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937", + "ConwayGenesisFile": "conway-genesis.json", + "ConwayGenesisHash": "0eb6adaec3fcb1fe286c1b4ae0da2a117eafc3add51e17577d36dd39eddfc3db", "EnableP2P": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 2, diff --git a/configs/cardano/preprod/conway-genesis.json b/configs/cardano/preprod/conway-genesis.json new file mode 100644 index 00000000000..09c77b4d33e --- /dev/null +++ b/configs/cardano/preprod/conway-genesis.json @@ -0,0 +1,303 @@ +{ + "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 + }, + "threshold": { + "numerator": 2, + "denominator": 3 + } + } +} diff --git a/configs/cardano/preview/config.json b/configs/cardano/preview/config.json index 14a2834b7ad..2a5ab35ae43 100644 --- a/configs/cardano/preview/config.json +++ b/configs/cardano/preview/config.json @@ -3,6 +3,8 @@ "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", "ByronGenesisFile": "byron-genesis.json", "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761", + "ConwayGenesisFile": "conway-genesis.json", + "ConwayGenesisHash": "9cc5084f02e27210eacba47af0872e3dba8946ad9460b6072d793e1d2f3987ef", "EnableP2P": true, "ExperimentalHardForksEnabled": false, "ExperimentalProtocolsEnabled": false, diff --git a/configs/cardano/preview/conway-genesis.json b/configs/cardano/preview/conway-genesis.json new file mode 100644 index 00000000000..4f8b1d06492 --- /dev/null +++ b/configs/cardano/preview/conway-genesis.json @@ -0,0 +1,297 @@ +{ + "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": 0, + "committeeMaxTermLength": 365, + "govActionLifetime": 30, + "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-ff9babf23fef3f54ec29132c07a8e23807d7b395b143ecd8ff79f4c7": 1000 + }, + "threshold": { + "numerator": 2, + "denominator": 3 + } + } +} diff --git a/flake.lock b/flake.lock index df801b8cdfd..7e460041b7a 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1719971647, - "narHash": "sha256-Q/u1ZklzmymTSSY6/F48rGsWewVYf108torqR9+nFJU=", + "lastModified": 1721831314, + "narHash": "sha256-I1j5HPSbbh3l1D0C9oP/59YB4e+64K9NDRl7ueD1c/Y=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "bfd6987c14410757c6cde47e6c45621e9664347f", + "rev": "8815ee7598bc39a02db8896b788f69accf892790", "type": "github" }, "original": { @@ -320,16 +320,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1720029730, - "narHash": "sha256-ESE5/7XzXeIZldkYPbMd8CoMKQo9ghY1vOkhHpOj0K4=", + "lastModified": 1721843629, + "narHash": "sha256-F5wgRA820x16f+8c/LlEEBG0rMJIA1XWw6X0ZwX5UWs=", "owner": "IntersectMBO", "repo": "cardano-node", - "rev": "2820a63dc934c6d5b5f450b6c2543b81c6476696", + "rev": "176f99e51155cb3eaa0711db1c3c969d67438958", "type": "github" }, "original": { "owner": "IntersectMBO", - "ref": "9.0.0", + "ref": "9.1.0", "repo": "cardano-node", "type": "github" } @@ -1390,11 +1390,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1719237167, - "narHash": "sha256-ifW5Jfwu/iwYs0r7f8AdiWDQK+Pr1gZLz+p5u8OtOgo=", + "lastModified": 1721825987, + "narHash": "sha256-PPcma4tjozwXJAWf+YtHUQUulmxwulVlwSQzKItx/n8=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "577f4d5072945a88dda6f5cfe205e6b4829a0423", + "rev": "eb61f2c14e1f610ec59117ad40f8690cddbf80cb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 63d69da27d7..625735297e8 100644 --- a/flake.nix +++ b/flake.nix @@ -142,7 +142,7 @@ flake = false; }; customConfig.url = "github:input-output-hk/empty-flake"; - cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=9.0.0"; + cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=9.1.0"; }; outputs = { self, nixpkgs, nixpkgs-unstable, hostNixpkgs, flake-utils, diff --git a/justfile b/justfile index 9c942c1a2e6..77ade8ab18b 100644 --- a/justfile +++ b/justfile @@ -138,19 +138,13 @@ integration-tests match: '.#integration-exe' \ -c integration-exe -j 2 --match="{{match}}" -#start a shell with 9.0.0 in scope -node-8121: - nix shell \ - --accept-flake-config \ - 'github:IntersectMBO/cardano-node?ref=9.0.0#cardano-node' \ - 'github:IntersectMBO/cardano-node?ref=9.0.0#cardano-cli' -# start a shell with 9.0.0 in scope -node-900: +# start a shell with 9.1.0 in scope +node-910: nix shell \ --accept-flake-config \ - 'github:IntersectMBO/cardano-node?ref=9.0.0#cardano-node' \ - 'github:IntersectMBO/cardano-node?ref=9.0.0#cardano-cli' + 'github:IntersectMBO/cardano-node?ref=9.1.0#cardano-node' \ + 'github:IntersectMBO/cardano-node?ref=9.1.0#cardano-cli' # run babbage integration tests matching the given pattern via nix babbage-integration-tests-match match: diff --git a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Cluster.hs b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Cluster.hs index 1c7a6e466be..7f599effe2b 100644 --- a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Cluster.hs +++ b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Cluster.hs @@ -207,7 +207,6 @@ withCluster config@Config{..} faucetFunds onClusterStart = runClusterM config map (,Coin 1_000_000_000_000_000) <$> readFaucetAddresses generateGenesis - cfgLastHardFork (pureAdaFunds <> faucetAddresses <> massiveWalletFunds) (addGenesisPools : cfgShelleyGenesisMods) diff --git a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenNodeConfig.hs b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenNodeConfig.hs index 03904f290ee..80e5424a28d 100644 --- a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenNodeConfig.hs +++ b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenNodeConfig.hs @@ -126,7 +126,7 @@ genNodeConfig nodeSegment name genesisFiles clusterEra logCfg = do let LogFileConfig severity mExtraLogFile extraSev = logCfg - GenesisRecord byronFile shelleyFile alonzoFile mconwayFile = genesisFiles + GenesisRecord byronFile shelleyFile alonzoFile conwayFile = genesisFiles scribes = let @@ -148,16 +148,12 @@ genNodeConfig nodeSegment name genesisFiles clusterEra logCfg = do (T.pack $ toFilePath file, extraSev) ] - setConwayFile = case mconwayFile of - Just conwayFile -> setFilePath "ConwayGenesisFile" conwayFile - Nothing -> key "ConwayGenesisFile" .~ Null - patchConfig value = value & setFilePath "ByronGenesisFile" byronFile & setFilePath "ShelleyGenesisFile" shelleyFile & setFilePath "AlonzoGenesisFile" alonzoFile - & setConwayFile + & setFilePath "ConwayGenesisFile" conwayFile & removeGenesisHashes & setHardFork "ShelleyHardFork" & setHardFork "AllegraHardFork" @@ -193,8 +189,7 @@ genNodeConfig nodeSegment name genesisFiles clusterEra logCfg = do controlExperimental :: ClusterEra -> ChangeValue controlExperimental = \case - BabbageHardFork -> setExperimental False - ConwayHardFork -> setExperimental True + _ -> setExperimental False setExperimental :: Bool -> ChangeValue setExperimental enabled value = value diff --git a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenesisFiles.hs b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenesisFiles.hs index 32649812bf9..2db273c41d5 100644 --- a/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenesisFiles.hs +++ b/lib/local-cluster/lib/Cardano/Wallet/Launch/Cluster/Node/GenesisFiles.hs @@ -54,9 +54,6 @@ import Cardano.Wallet.Launch.Cluster.Aeson ( ChangeValue , decodeFileThrow ) -import Cardano.Wallet.Launch.Cluster.ClusterEra - ( ClusterEra (..) - ) import Cardano.Wallet.Launch.Cluster.ClusterM ( ClusterM ) @@ -140,7 +137,7 @@ data GenesisRecord f = GenesisRecord { byronGenesis :: f "genesis-byron" , shelleyGenesis :: f "genesis-shelley" , alonzoGenesis :: f "genesis-alonzo" - , conwayGenesis :: Maybe (f "genesis-conway") + , conwayGenesis :: f "genesis-conway" } deriving stock (Generic) @@ -148,12 +145,11 @@ instance FFunctor GenesisRecord where ffmap = ffmapDefault instance FFoldable GenesisRecord where ffoldMap = ffoldMapDefault instance FTraversable GenesisRecord where ftraverse f (GenesisRecord a b c d) = - GenesisRecord <$> f a <*> f b <*> f c <*> traverse f d + GenesisRecord <$> f a <*> f b <*> f c <*> f d instance FZip GenesisRecord where - fzipWith f (GenesisRecord a b c md) (GenesisRecord a' b' c' md') = - GenesisRecord (f a a') (f b b') (f c c') $ do - f <$> md <*> md' + fzipWith f (GenesisRecord a b c d) (GenesisRecord a' b' c' d') = + GenesisRecord (f a a') (f b b') (f c c') (f d d') deriving stock instance Show (GenesisRecord FileOf) @@ -183,18 +179,14 @@ writeGenesis fs vs = fs vs -withConway :: ClusterEra -> a -> Maybe a -withConway ConwayHardFork a = Just a -withConway _ _ = Nothing - -- | Create genesis absolute file paths from a directory -mkGenesisFiles :: ClusterEra -> DirOf s -> GenesisFiles -mkGenesisFiles wc (DirOf d) = +mkGenesisFiles :: DirOf s -> GenesisFiles +mkGenesisFiles (DirOf d) = GenesisRecord { byronGenesis = mkFile "byron" , shelleyGenesis = mkFile "shelley" , alonzoGenesis = mkFile "alonzo" - , conwayGenesis = withConway wc $ mkFile "conway" + , conwayGenesis = mkFile "conway" } where mkFile :: String -> FileOf x @@ -203,24 +195,22 @@ mkGenesisFiles wc (DirOf d) = -- | Read genesis files from template directory, apply template modifications -- and write them back to the config directory produceGenesis - :: ClusterEra - -> DirOf template + :: DirOf template -> DirOf configs -> GenesisTemplateMods -> IO GenesisFiles -produceGenesis wc templateDir configsDir mods = do - let templates = mkGenesisFiles wc templateDir - let configs = mkGenesisFiles wc configsDir +produceGenesis templateDir configsDir mods = do + let templates = mkGenesisFiles templateDir + let configs = mkGenesisFiles configsDir readGenesis templates >>= writeGenesis configs . applyTemplateMods mods pure configs generateGenesis :: HasCallStack - => ClusterEra - -> [(Address, Coin)] + => [(Address, Coin)] -> [ShelleyGenesisModifier] -> ClusterM GenesisFiles -generateGenesis wc initialFunds genesisMods = do +generateGenesis initialFunds genesisMods = do Config{..} <- ask {- The timestamp of the 0-th slot. @@ -319,15 +309,17 @@ generateGenesis wc initialFunds genesisMods = do } genesisMods - produceGenesis wc cfgClusterConfigs cfgClusterDir + produceGenesis cfgClusterConfigs cfgClusterDir $ GenesisRecord { byronGenesis = Const $ key "startTime" .~ toJSON - (round @_ @Int $ utcTimeToPOSIXSeconds systemStart) + ( round @_ @Int + $ utcTimeToPOSIXSeconds systemStart + ) , shelleyGenesis = Const $ \_ -> toJSON shelleyGenesisData , alonzoGenesis = Const id - , conwayGenesis = withConway wc $ Const id + , conwayGenesis = Const id } diff --git a/lib/local-cluster/test/data/cluster-configs/conway-genesis.json b/lib/local-cluster/test/data/cluster-configs/conway-genesis.json index 28442ce1c50..760995a34d4 100644 --- a/lib/local-cluster/test/data/cluster-configs/conway-genesis.json +++ b/lib/local-cluster/test/data/cluster-configs/conway-genesis.json @@ -1,278 +1,303 @@ { - "committee": { - "members": { - "scriptHash-2c698e41831684b16477fb50082b0c0e396d436504e39037d5366582": 400, - "scriptHash-8fc13431159fdda66347a38c55105d50d77d67abc1c368b876d52ad1": 336, - "scriptHash-921e1ccb4812c4280510c9ccab81c561f3d413e7d744d48d61215d1f": 400, - "scriptHash-d5d09d9380cf9dcde1f3c6cd88b08ca9e00a3d550022ca7ee4026342": 400 - }, - "threshold": 0.66 + "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-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": 580, + "scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": 580, + "scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": 580, + "scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": 580, + "scriptHash-349e55f83e9af24813e6cb368df6a80d38951b2a334dfcdf26815558": 580, + "scriptHash-84aebcfd3e00d0f87af918fc4b5e00135f407e379893df7e7d392c6a": 580, + "scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": 580 }, - "committeeMaxTermLength": 73, - "committeeMinSize": 3, - "constitution": { - "anchor": { - "dataHash": "f89cc2469ce31c3dfda2f3e0b56c5c8b4ee4f0e5f66c30a3f12a95298b01179e", - "url": "https://raw.githubusercontent.com/carloslodelar/proposals/main/constitution.txt" - } - }, - "dRepActivity": 20, - "dRepDeposit": 500000000, - "dRepVotingThresholds": { - "committeeNoConfidence": 0.6, - "committeeNormal": 0.67, - "hardForkInitiation": 0.6, - "motionNoConfidence": 0.67, - "ppEconomicGroup": 0.67, - "ppGovGroup": 0.75, - "ppNetworkGroup": 0.67, - "ppTechnicalGroup": 0.67, - "treasuryWithdrawal": 0.67, - "updateToConstitution": 0.75 - }, - "govActionDeposit": 50000000000, - "govActionLifetime": 8, - "minFeeRefScriptCostPerByte": 44, - "plutusV3CostModel": [ - 205665, - 812, - 1, - 1, - 1000, - 571, - 0, - 1, - 1000, - 24177, - 4, - 1, - 1000, - 32, - 117366, - 10475, - 4, - 23000, - 100, - 23000, - 100, - 23000, - 100, - 23000, - 100, - 23000, - 100, - 23000, - 100, - 100, - 100, - 23000, - 100, - 19537, - 32, - 175354, - 32, - 46417, - 4, - 221973, - 511, - 0, - 1, - 89141, - 32, - 497525, - 14068, - 4, - 2, - 196500, - 453240, - 220, - 0, - 1, - 1, - 1000, - 28662, - 4, - 2, - 245000, - 216773, - 62, - 1, - 1060367, - 12586, - 1, - 208512, - 421, - 1, - 187000, - 1000, - 52998, - 1, - 80436, - 32, - 43249, - 32, - 1000, - 32, - 80556, - 1, - 57667, - 4, - 1000, - 10, - 197145, - 156, - 1, - 197145, - 156, - 1, - 204924, - 473, - 1, - 208896, - 511, - 1, - 52467, - 32, - 64832, - 32, - 65493, - 32, - 22558, - 32, - 16563, - 32, - 76511, - 32, - 196500, - 453240, - 220, - 0, - 1, - 1, - 69522, - 11687, - 0, - 1, - 60091, - 32, - 196500, - 453240, - 220, - 0, - 1, - 1, - 196500, - 453240, - 220, - 0, - 1, - 1, - 1159724, - 392670, - 0, - 2, - 806990, - 30482, - 4, - 1927926, - 82523, - 4, - 265318, - 0, - 4, - 0, - 85931, - 32, - 205665, - 812, - 1, - 1, - 41182, - 32, - 212342, - 32, - 31220, - 32, - 32696, - 32, - 43357, - 32, - 32247, - 32, - 38314, - 32, - 35190005, - 10, - 57996947, - 18975, - 10, - 39121781, - 32260, - 10, - 23000, - 100, - 23000, - 100, - 832808, - 18, - 3209094, - 6, - 331451, - 1, - 65990684, - 23097, - 18, - 114242, - 18, - 94393407, - 87060, - 18, - 16420089, - 18, - 2145798, - 36, - 3795345, - 12, - 889023, - 1, - 204237282, - 23271, - 36, - 129165, - 36, - 189977790, - 85902, - 36, - 33012864, - 36, - 388443360, - 1, - 401885761, - 72, - 2331379, - 72, - 1927926, - 82523, - 4, - 117366, - 10475, - 4, - 1292075, - 24469, - 74, - 0, - 1, - 936157, - 49601, - 237, - 0, - 1 - ], - "poolVotingThresholds": { - "committeeNoConfidence": 0.51, - "committeeNormal": 0.6, - "hardForkInitiation": 0.51, - "motionNoConfidence": 0.6, - "ppSecurityGroup": 0.6 + "threshold": { + "numerator": 2, + "denominator": 3 } -} \ No newline at end of file + } +} diff --git a/lib/local-cluster/test/data/cluster-configs/node-config.json b/lib/local-cluster/test/data/cluster-configs/node-config.json index 01c815355d5..7008f78c4b5 100644 --- a/lib/local-cluster/test/data/cluster-configs/node-config.json +++ b/lib/local-cluster/test/data/cluster-configs/node-config.json @@ -5,8 +5,8 @@ "ByronGenesisFile": "byron-genesis.json", "ConwayGenesisFile": "conway-genesis.json", "EnableP2P": true, - "ExperimentalHardForksEnabled": true, - "ExperimentalProtocolsEnabled": true, + "ExperimentalHardForksEnabled": false, + "ExperimentalProtocolsEnabled": false, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, "LastKnownBlockVersion-Minor": 1, diff --git a/lib/local-cluster/test/data/cluster-configs/template/conway.json b/lib/local-cluster/test/data/cluster-configs/template/conway.json index 5f1de84e6eb..760995a34d4 100644 --- a/lib/local-cluster/test/data/cluster-configs/template/conway.json +++ b/lib/local-cluster/test/data/cluster-configs/template/conway.json @@ -7,32 +7,297 @@ "ppSecurityGroup": 0.51 }, "dRepVotingThresholds": { - "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 + "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": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, + "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": { - "url": "", - "dataHash": "0000000000000000000000000000000000000000000000000000000000000000" - } + "anchor": { + "dataHash": "ca41a91f399259bcefe57f9858e91f6d00e1a38d6d9c63d4052914ea7bd70cb2", + "url": "ipfs://bafkreifnwj6zpu3ixa4siz2lndqybyc5wnnt3jkwyutci4e2tmbnj3xrdm" + }, + "script": "fa24fb305126805cf2164c161d852a0e7330cf988f1fe558cf7d4a64" }, "committee": { "members": { + "scriptHash-df0e83bde65416dade5b1f97e7f115cc1ff999550ad968850783fe50": 580, + "scriptHash-b6012034ba0a7e4afbbf2c7a1432f8824aee5299a48e38e41a952686": 580, + "scriptHash-ce8b37a72b178a37bbd3236daa7b2c158c9d3604e7aa667e6c6004b7": 580, + "scriptHash-f0dc2c00d92a45521267be2d5de1c485f6f9d14466d7e16062897cf7": 580, + "scriptHash-349e55f83e9af24813e6cb368df6a80d38951b2a334dfcdf26815558": 580, + "scriptHash-84aebcfd3e00d0f87af918fc4b5e00135f407e379893df7e7d392c6a": 580, + "scriptHash-e8165b3328027ee0d74b1f07298cb092fd99aa7697a1436f5997f625": 580 }, - "quorum": 0 + "threshold": { + "numerator": 2, + "denominator": 3 + } } } diff --git a/lib/wallet-benchmarks/data/membench-snapshot.tgz b/lib/wallet-benchmarks/data/membench-snapshot.tgz index 600eb3fed2e..c82f17e5ad1 100644 Binary files a/lib/wallet-benchmarks/data/membench-snapshot.tgz and b/lib/wallet-benchmarks/data/membench-snapshot.tgz differ diff --git a/run/common/docker/run.sh b/run/common/docker/run.sh index fa693391c63..7742fe822d2 100755 --- a/run/common/docker/run.sh +++ b/run/common/docker/run.sh @@ -28,7 +28,7 @@ RELEASE_WALLET_TAG=2024.7.7 WALLET_TAG=${WALLET_TAG:=$RELEASE_WALLET_TAG} export WALLET_TAG -NODE_TAG=9.0.0 +NODE_TAG=9.1.0 export NODE_TAG # Generate a random port for the wallet service and export it diff --git a/scripts/buildkite/main/bench-memory.sh b/scripts/buildkite/main/bench-memory.sh index 5f8bdc42a9d..b36ba154fd1 100755 --- a/scripts/buildkite/main/bench-memory.sh +++ b/scripts/buildkite/main/bench-memory.sh @@ -31,11 +31,18 @@ nix shell \ echo "------------------------ Nix call done ----------------------------------" echo "------------------------ Results ----------------------------------------" + +if [ -n "${BUILDKITE:-}" ]; then + echo "--- Upload logs" + buildkite-agent artifact upload $log + buildkite-agent artifact upload $error_log +fi + mv cardano-wallet.hp $artifact_name.hp hp2pretty $artifact_name.hp if [ -n "${BUILDKITE:-}" ]; then - echo "--- Upload" + echo "--- Upload heap profile" buildkite-agent artifact upload $artifact_name.svg buildkite-agent artifact upload $log buildkite-agent artifact upload $error_log @@ -45,6 +52,7 @@ if [ -n "${BUILDKITE:-}" ]; then "$artifact_name.svg" fi + echo "------------------------ Results done -----------------------------------" echo "------------------------ Cleanup ----------------------------------------" diff --git a/scripts/buildkite/main/docker-smoke-test.sh b/scripts/buildkite/main/docker-smoke-test.sh index e90b3b16de0..0601de0d118 100755 --- a/scripts/buildkite/main/docker-smoke-test.sh +++ b/scripts/buildkite/main/docker-smoke-test.sh @@ -17,7 +17,7 @@ rsync -a --delete "$NODE_STATE_DIR/db/" "$TESTS_NODE_DB" WALLET_TAG=$(buildkite-agent meta-data get "release-cabal-version") export WALLET_TAG -NODE_TAG="9.0.0" +NODE_TAG="9.1.0" export NODE_TAG NODE_DB="$TESTS_NODE_DB" diff --git a/scripts/buildkite/release/docker-smoke-test.sh b/scripts/buildkite/release/docker-smoke-test.sh index e32f442ea52..9ca4e039710 100755 --- a/scripts/buildkite/release/docker-smoke-test.sh +++ b/scripts/buildkite/release/docker-smoke-test.sh @@ -17,7 +17,7 @@ rsync -a --delete "$NODE_STATE_DIR/db/" "$TESTS_NODE_DB" WALLET_TAG=$(buildkite-agent meta-data get "release-cabal-version") export WALLET_TAG -NODE_TAG="9.0.0" +NODE_TAG="9.1.0" export NODE_TAG NODE_DB="$TESTS_NODE_DB" diff --git a/scripts/release-candidate.sh b/scripts/release-candidate.sh index 460afc72f84..d054f7c2b6b 100755 --- a/scripts/release-candidate.sh +++ b/scripts/release-candidate.sh @@ -34,7 +34,7 @@ echo "OLD_GIT_TAG=$OLD_GIT_TAG" OLD_CABAL_VERSION=$(tag_cabal_ver "$OLD_GIT_TAG") echo "OLD_CABAL_VERSION=$OLD_CABAL_VERSION" -CARDANO_NODE_TAG="9.0.0" +CARDANO_NODE_TAG="9.1.0" echo "CARDANO_NODE_TAG=$CARDANO_NODE_TAG" git checkout "$BASE_COMMIT" diff --git a/test/e2e/README.md b/test/e2e/README.md index fe88d386ec6..97ad31bcc45 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -74,7 +74,7 @@ One can also start tests against cardano-wallet docker. There is docker-compose- >NETWORK=preprod \ >TESTS_E2E_TOKEN_METADATA=https://metadata.world.dev.cardano.org/ \ >WALLET=dev-master \ ->NODE=9.0.0 \ +>NODE=9.1.0 \ >NODE_CONFIG_PATH=`pwd`/state/configs/$NETWORK \ >DATA=`pwd`/state/node_db/$NETWORK >docker-compose -f docker-compose-test.yml up diff --git a/test/e2e/docker_compose.sh b/test/e2e/docker_compose.sh index defc9c52001..77a9a9f2050 100755 --- a/test/e2e/docker_compose.sh +++ b/test/e2e/docker_compose.sh @@ -3,7 +3,7 @@ NETWORK=preprod \ TESTS_E2E_TOKEN_METADATA=https://metadata.world.dev.cardano.org/ \ WALLET=dev-master \ -NODE=9.0.0 \ +NODE=9.1.0 \ NODE_CONFIG_PATH=`pwd`/state/configs/$NETWORK \ DATA=`pwd`/state/node_db/$NETWORK \ WALLET_DATA=`pwd`/state/wallet_db/$NETWORK \