diff --git a/compose/aarch64.yml b/compose/aarch64.yml index 846e2e5a670..8c3f895b917 100644 --- a/compose/aarch64.yml +++ b/compose/aarch64.yml @@ -2,10 +2,10 @@ services: cardano-db-sync: - image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-sancho-5.0.0} + image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.3.0.0} cardano-node: - image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-8.11.0-sancho} + image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-9.0.0} ogmios: - image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.4.0} + image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-6.5.0} cardano-submit-api: - image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-8.11.0-sancho} + image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-9.0.0} diff --git a/compose/common.yml b/compose/common.yml index c98e932f630..63e2322aa1d 100644 --- a/compose/common.yml +++ b/compose/common.yml @@ -111,7 +111,7 @@ services: depends_on: ogmios: condition: service_healthy - image: ghcr.io/intersectmbo/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-sancho-5.0.0} + image: ghcr.io/intersectmbo/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.3.0.0} restart: on-failure stop_signal: SIGINT volumes: @@ -122,7 +122,7 @@ services: <<: - *logging - *with-postgres - image: ghcr.io/intersectmbo/cardano-smash-server:${CARDANO_DB_SYNC_VERSION:-sancho-5.0.0} + image: ghcr.io/intersectmbo/cardano-smash-server:${CARDANO_DB_SYNC_VERSION:-13.3.0.0} command: ['--config', '/config/cardano-db-sync/config.json'] environment: POSTGRES_HOST: postgres @@ -143,7 +143,7 @@ services: cardano-node: <<: *logging - image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-8.11.0-sancho} + image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-9.0.0} command: [ 'run', @@ -163,7 +163,7 @@ services: ogmios: <<: *logging - image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.4.0} + image: cardanosolutions/ogmios:v${OGMIOS_VERSION:-6.5.0} command: ['--host', '0.0.0.0', '--node-socket', '/ipc/node.socket', '--node-config', '/config/cardano-node/config.json'] depends_on: @@ -179,7 +179,7 @@ services: cardano-submit-api: command: --config /config/cardano-submit-api/config.json --listen-address 0.0.0.0 --socket-path /ipc/node.socket $SUBMIT_API_ARGS - image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-8.11.0-sancho} + image: ghcr.io/intersectmbo/cardano-submit-api:${CARDANO_NODE_VERSION:-9.0.0} ports: - 8090:8090 restart: on-failure diff --git a/packages/cardano-services/config/.github/scripts/download-all.sh b/packages/cardano-services/config/.github/scripts/download-all.sh index 62858a9b225..893bfc14ca0 100755 --- a/packages/cardano-services/config/.github/scripts/download-all.sh +++ b/packages/cardano-services/config/.github/scripts/download-all.sh @@ -13,7 +13,7 @@ mkdir -p \ wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/topology.json -O network/$CARDANO_NETWORK/cardano-node/topology.json wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/config.json \ - | jq '.ByronGenesisFile = "../genesis/byron.json" | .ShelleyGenesisFile = "../genesis/shelley.json" | .AlonzoGenesisFile = "../genesis/alonzo.json" | .ConwayGenesisFile = "../genesis/conway.json"' \ + | jq '.ByronGenesisFile = "../genesis/byron.json" | .ShelleyGenesisFile = "../genesis/shelley.json" | .AlonzoGenesisFile = "../genesis/alonzo.json"' \ | jq '.' > network/$CARDANO_NETWORK/cardano-node/config.json wget -qO- $CARDANO_CONFIG_URL/$CARDANO_NETWORK/db-sync-config.json \ | jq '.NodeConfigFile = "../cardano-node/config.json"' \ @@ -25,4 +25,12 @@ wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/submit-api-config.json -O network/$ wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/byron-genesis.json -O network/$CARDANO_NETWORK/genesis/byron.json wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/shelley-genesis.json -O network/$CARDANO_NETWORK/genesis/shelley.json wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/alonzo-genesis.json -O network/$CARDANO_NETWORK/genesis/alonzo.json -wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json -O network/$CARDANO_NETWORK/genesis/conway.json +if wget --spider $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json 2>/dev/null; then + wget -q $CARDANO_CONFIG_URL/$CARDANO_NETWORK/conway-genesis.json -O network/$CARDANO_NETWORK/genesis/conway.json + mv network/$CARDANO_NETWORK/cardano-node/config.json network/$CARDANO_NETWORK/cardano-node/config.json.tmp + cat network/$CARDANO_NETWORK/cardano-node/config.json.tmp \ + | jq '.ConwayGenesisFile = "../genesis/conway.json"' \ + | jq '.' > network/$CARDANO_NETWORK/cardano-node/config.json + rm network/$CARDANO_NETWORK/cardano-node/config.json.tmp +fi + diff --git a/packages/cardano-services/config/.gitrepo b/packages/cardano-services/config/.gitrepo index 9ef256fe028..0371ad1f04a 100644 --- a/packages/cardano-services/config/.gitrepo +++ b/packages/cardano-services/config/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/input-output-hk/cardano-configurations.git branch = master - commit = 692010ed0f454bfbb566c06443227c79e2f4dbab - parent = c1a83293a9a7a1310634d1dc3588094e3d925cb3 + commit = 6d7fac44d6a877ae9a3cf5eeda163ae539b17774 + parent = 7a63ab70ea8640b07cd9c38cb77f22d76875e576 method = merge cmdver = 0.4.6 diff --git a/packages/cardano-services/config/network/mainnet/cardano-node/config.json b/packages/cardano-services/config/network/mainnet/cardano-node/config.json index 2ddddeb6912..998d85cd7fc 100644 --- a/packages/cardano-services/config/network/mainnet/cardano-node/config.json +++ b/packages/cardano-services/config/network/mainnet/cardano-node/config.json @@ -3,8 +3,6 @@ "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", "ByronGenesisFile": "../genesis/byron.json", "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb", - "ConwayGenesisFile": "../genesis/conway.json", - "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e", "EnableP2P": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, diff --git a/packages/cardano-services/config/network/mainnet/genesis/conway.json b/packages/cardano-services/config/network/mainnet/genesis/conway.json deleted file mode 100644 index 5f1de84e6eb..00000000000 --- a/packages/cardano-services/config/network/mainnet/genesis/conway.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "poolVotingThresholds": { - "committeeNormal": 0.51, - "committeeNoConfidence": 0.51, - "hardForkInitiation": 0.51, - "motionNoConfidence": 0.51, - "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 - }, - "committeeMinSize": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, - "dRepActivity": 20, - "constitution": { - "anchor": { - "url": "", - "dataHash": "0000000000000000000000000000000000000000000000000000000000000000" - } - }, - "committee": { - "members": { - }, - "quorum": 0 - } -} diff --git a/packages/cardano-services/config/network/preprod/cardano-node/config.json b/packages/cardano-services/config/network/preprod/cardano-node/config.json index b7cae2aed78..5d6b4490bfc 100644 --- a/packages/cardano-services/config/network/preprod/cardano-node/config.json +++ b/packages/cardano-services/config/network/preprod/cardano-node/config.json @@ -3,13 +3,11 @@ "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", "ByronGenesisFile": "../genesis/byron.json", "ByronGenesisHash": "d4b8de7a11d929a323373cbab6c1a9bdc931beffff11db111cf9d57356ee1937", - "ConwayGenesisFile": "../genesis/conway.json", - "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e", "EnableP2P": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 2, "LastKnownBlockVersion-Minor": 0, - "MinNodeVersion": "8.9.2", + "MinNodeVersion": "8.12.0", "PeerSharing": true, "Protocol": "Cardano", "RequiresNetworkMagic": "RequiresMagic", @@ -17,7 +15,7 @@ "ShelleyGenesisHash": "162d29c4e1cf6b8a84f2d692e67a3ac6bc7851bc3e6e4afe64d15778bed8bd86", "TargetNumberOfActivePeers": 20, "TargetNumberOfEstablishedPeers": 50, - "TargetNumberOfKnownPeers": 100, + "TargetNumberOfKnownPeers": 150, "TargetNumberOfRootPeers": 60, "TraceAcceptPolicy": true, "TraceBlockFetchClient": false, diff --git a/packages/cardano-services/config/network/preprod/cardano-node/topology.json b/packages/cardano-services/config/network/preprod/cardano-node/topology.json index 9faac371406..2241cbcb9aa 100644 --- a/packages/cardano-services/config/network/preprod/cardano-node/topology.json +++ b/packages/cardano-services/config/network/preprod/cardano-node/topology.json @@ -19,5 +19,5 @@ "advertise": false } ], - "useLedgerAfterSlot": 52358331 + "useLedgerAfterSlot": 64454371 } diff --git a/packages/cardano-services/config/network/preprod/genesis/conway.json b/packages/cardano-services/config/network/preprod/genesis/conway.json deleted file mode 100644 index 5f1de84e6eb..00000000000 --- a/packages/cardano-services/config/network/preprod/genesis/conway.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "poolVotingThresholds": { - "committeeNormal": 0.51, - "committeeNoConfidence": 0.51, - "hardForkInitiation": 0.51, - "motionNoConfidence": 0.51, - "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 - }, - "committeeMinSize": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, - "dRepActivity": 20, - "constitution": { - "anchor": { - "url": "", - "dataHash": "0000000000000000000000000000000000000000000000000000000000000000" - } - }, - "committee": { - "members": { - }, - "quorum": 0 - } -} diff --git a/packages/cardano-services/config/network/preview/cardano-node/config.json b/packages/cardano-services/config/network/preview/cardano-node/config.json index e17a3137d9a..b2677285bd5 100644 --- a/packages/cardano-services/config/network/preview/cardano-node/config.json +++ b/packages/cardano-services/config/network/preview/cardano-node/config.json @@ -3,15 +3,13 @@ "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", "ByronGenesisFile": "../genesis/byron.json", "ByronGenesisHash": "83de1d7302569ad56cf9139a41e2e11346d4cb4a31c00142557b6ab3fa550761", - "ConwayGenesisFile": "../genesis/conway.json", - "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e", "EnableP2P": true, "ExperimentalHardForksEnabled": false, "ExperimentalProtocolsEnabled": false, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, "LastKnownBlockVersion-Minor": 1, - "MinNodeVersion": "8.9.2", + "MinNodeVersion": "8.12.0", "PeerSharing": true, "Protocol": "Cardano", "RequiresNetworkMagic": "RequiresMagic", @@ -19,7 +17,7 @@ "ShelleyGenesisHash": "363498d1024f84bb39d3fa9593ce391483cb40d479b87233f868d6e57c3a400d", "TargetNumberOfActivePeers": 20, "TargetNumberOfEstablishedPeers": 50, - "TargetNumberOfKnownPeers": 100, + "TargetNumberOfKnownPeers": 150, "TargetNumberOfRootPeers": 60, "TestAllegraHardForkAtEpoch": 0, "TestAlonzoHardForkAtEpoch": 0, diff --git a/packages/cardano-services/config/network/preview/cardano-node/topology.json b/packages/cardano-services/config/network/preview/cardano-node/topology.json index 3028448484d..3a6607f594f 100644 --- a/packages/cardano-services/config/network/preview/cardano-node/topology.json +++ b/packages/cardano-services/config/network/preview/cardano-node/topology.json @@ -19,5 +19,5 @@ "advertise": false } ], - "useLedgerAfterSlot": 41385503 + "useLedgerAfterSlot": 53827185 } diff --git a/packages/cardano-services/config/network/preview/genesis/conway.json b/packages/cardano-services/config/network/preview/genesis/conway.json deleted file mode 100644 index 5f1de84e6eb..00000000000 --- a/packages/cardano-services/config/network/preview/genesis/conway.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "poolVotingThresholds": { - "committeeNormal": 0.51, - "committeeNoConfidence": 0.51, - "hardForkInitiation": 0.51, - "motionNoConfidence": 0.51, - "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 - }, - "committeeMinSize": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, - "dRepActivity": 20, - "constitution": { - "anchor": { - "url": "", - "dataHash": "0000000000000000000000000000000000000000000000000000000000000000" - } - }, - "committee": { - "members": { - }, - "quorum": 0 - } -} diff --git a/packages/cardano-services/config/network/sanchonet/cardano-node/config.json b/packages/cardano-services/config/network/sanchonet/cardano-node/config.json index a43d233a1f6..75a13aed6d2 100644 --- a/packages/cardano-services/config/network/sanchonet/cardano-node/config.json +++ b/packages/cardano-services/config/network/sanchonet/cardano-node/config.json @@ -4,14 +4,14 @@ "ByronGenesisFile": "../genesis/byron.json", "ByronGenesisHash": "785eb88427e136378a15b0a152a8bfbeec7a611529ccda29c43a1e60ffb48eaa", "ConwayGenesisFile": "../genesis/conway.json", - "ConwayGenesisHash": "79766b0c18076e9abefc806526714f30d42b14dba9f187fb316bd4e70c815ef4", + "ConwayGenesisHash": "e85ee5b7af8ca5c273c20746c9f994aef1a72a79c38b4eea230817e7e66c0741", "EnableP2P": true, "ExperimentalHardForksEnabled": true, "ExperimentalProtocolsEnabled": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, "LastKnownBlockVersion-Minor": 1, - "MinNodeVersion": "8.11.0", + "MinNodeVersion": "8.12.0", "PeerSharing": true, "Protocol": "Cardano", "RequiresNetworkMagic": "RequiresMagic", @@ -19,7 +19,7 @@ "ShelleyGenesisHash": "f94457ec45a0c6773057a529533cf7ccf746cb44dabd56ae970e1dbfb55bfdb2", "TargetNumberOfActivePeers": 20, "TargetNumberOfEstablishedPeers": 50, - "TargetNumberOfKnownPeers": 100, + "TargetNumberOfKnownPeers": 150, "TargetNumberOfRootPeers": 60, "TestAllegraHardForkAtEpoch": 0, "TestAlonzoHardForkAtEpoch": 0, diff --git a/packages/cardano-services/config/network/sanchonet/cardano-node/topology.json b/packages/cardano-services/config/network/sanchonet/cardano-node/topology.json index 4e41c44e51f..101e1e4a639 100644 --- a/packages/cardano-services/config/network/sanchonet/cardano-node/topology.json +++ b/packages/cardano-services/config/network/sanchonet/cardano-node/topology.json @@ -19,5 +19,5 @@ "advertise": false } ], - "useLedgerAfterSlot": 21599922 + "useLedgerAfterSlot": 33695977 } diff --git a/packages/cardano-services/config/network/sanchonet/genesis/conway.json b/packages/cardano-services/config/network/sanchonet/genesis/conway.json index 33719afca5d..81b2f4b7deb 100644 --- a/packages/cardano-services/config/network/sanchonet/genesis/conway.json +++ b/packages/cardano-services/config/network/sanchonet/genesis/conway.json @@ -1,7 +1,7 @@ { "poolVotingThresholds": { - "committeeNormal": 0.6, - "committeeNoConfidence": 0.51, + "committeeNormal": 0.65, + "committeeNoConfidence": 0.65, "hardForkInitiation": 0.51, "motionNoConfidence": 0.6, "ppSecurityGroup": 0.6 @@ -9,7 +9,7 @@ "dRepVotingThresholds": { "motionNoConfidence": 0.67, "committeeNormal": 0.67, - "committeeNoConfidence": 0.6, + "committeeNoConfidence": 0.65, "updateToConstitution": 0.75, "hardForkInitiation": 0.6, "ppNetworkGroup": 0.67, @@ -18,261 +18,281 @@ "ppGovGroup": 0.75, "treasuryWithdrawal": 0.67 }, - "committeeMinSize": 3, - "committeeMaxTermLength": 73, - "govActionLifetime": 8, - "govActionDeposit": 50000000000, + "committeeMinSize": 5, + "committeeMaxTermLength": 146, + "govActionLifetime": 14, + "govActionDeposit": 100000000000, "dRepDeposit": 500000000, "dRepActivity": 20, - "minFeeRefScriptCostPerByte": 44, + "minFeeRefScriptCostPerByte": 15, "plutusV3CostModel": [ - 205665, - 812, + 100788, + 420, 1, 1, 1000, - 571, + 173, 0, 1, 1000, - 24177, + 59957, 4, 1, - 1000, + 11183, 32, - 117366, - 10475, + 201305, + 8356, 4, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, 100, 100, - 23000, + 16000, 100, - 19537, + 94375, 32, - 175354, + 132994, 32, - 46417, + 61462, 4, - 221973, - 511, + 72010, + 178, 0, 1, - 89141, + 22151, 32, - 497525, - 14068, + 91189, + 769, 4, 2, - 196500, - 453240, - 220, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, 0, 1, 1, 1000, - 28662, + 42921, 4, 2, - 245000, - 216773, - 62, + 24548, + 29498, + 38, 1, - 1060367, - 12586, + 898148, + 27279, 1, - 208512, - 421, + 51775, + 558, 1, - 187000, + 39184, 1000, - 52998, + 60594, 1, - 80436, + 141895, 32, - 43249, + 83150, 32, - 1000, + 15299, 32, - 80556, + 76049, 1, - 57667, + 13169, 4, - 1000, + 22100, 10, - 197145, - 156, + 28999, + 74, 1, - 197145, - 156, + 28999, + 74, 1, - 204924, - 473, + 43285, + 552, 1, - 208896, - 511, + 44749, + 541, 1, - 52467, + 33852, 32, - 64832, + 68246, 32, - 65493, + 72362, 32, - 22558, + 7243, 32, - 16563, + 7391, 32, - 76511, + 11546, 32, - 196500, - 453240, - 220, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, 0, 1, - 1, - 69522, - 11687, + 90434, + 519, 0, 1, - 60091, + 74433, 32, - 196500, - 453240, - 220, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, 0, 1, 1, - 196500, - 453240, - 220, + 85848, + 123203, + 7305, + -900, + 1716, + 549, + 57, + 85848, 0, 1, - 1, - 1159724, - 392670, + 955506, + 213312, 0, 2, - 806990, - 30482, + 270652, + 22588, 4, - 1927926, - 82523, + 1457325, + 64566, 4, - 265318, - 0, + 20467, + 1, 4, 0, - 85931, + 141992, 32, - 205665, - 812, + 100788, + 420, 1, 1, - 41182, + 81663, 32, - 212342, + 59498, 32, - 31220, + 20142, 32, - 32696, + 24588, 32, - 43357, + 20744, 32, - 32247, + 25933, 32, - 38314, + 24623, 32, - 35190005, + 43053543, 10, - 57996947, - 18975, + 53384111, + 14333, 10, - 39121781, - 32260, + 43574283, + 26308, 10, - 23000, + 16000, 100, - 23000, + 16000, 100, - 832808, + 962335, 18, - 3209094, + 2780678, 6, - 331451, + 442008, 1, - 65990684, - 23097, + 52538055, + 3756, 18, - 114242, + 267929, 18, - 94393407, - 87060, + 76433006, + 8868, 18, - 16420089, + 52948122, 18, - 2145798, + 1995836, 36, - 3795345, + 3227919, 12, - 889023, + 901022, 1, - 204237282, - 23271, + 166917843, + 4307, 36, - 129165, + 284546, 36, - 189977790, - 85902, + 158221314, + 26549, 36, - 33012864, + 74698472, 36, - 388443360, + 333849714, 1, - 401885761, + 254006273, 72, - 2331379, + 2174038, 72, - 1927926, - 82523, + 2261318, + 64571, 4, - 117366, - 10475, + 207616, + 8310, 4, - 1292075, - 24469, - 74, + 1293828, + 28716, + 63, 0, 1, - 936157, - 49601, - 237, + 1006041, + 43623, + 251, 0, 1 ], "constitution": { "anchor": { - "url": "https://raw.githubusercontent.com/carloslodelar/proposals/main/constitution.txt", - "dataHash": "f89cc2469ce31c3dfda2f3e0b56c5c8b4ee4f0e5f66c30a3f12a95298b01179e" - } + "url": "ipfs://QmQq5hWDNzvDR1ForEktAHrdCQmfSL2u5yctNpzDwoSBu4", + "dataHash": "23b43bebac48a4acc39e578715aa06635d6d900fa3ea7441dfffd6e43b914f7b" + }, + "script": "edcd84c10e36ae810dc50847477083069db796219b39ccde790484e0" }, "committee": { "members": { - "scriptHash-8fc13431159fdda66347a38c55105d50d77d67abc1c368b876d52ad1": 336, - "scriptHash-921e1ccb4812c4280510c9ccab81c561f3d413e7d744d48d61215d1f": 400, - "scriptHash-d5d09d9380cf9dcde1f3c6cd88b08ca9e00a3d550022ca7ee4026342": 400, - "scriptHash-2c698e41831684b16477fb50082b0c0e396d436504e39037d5366582": 400 + "scriptHash-7ceede7d6a89e006408e6b7c6acb3dd094b3f6817e43b4a36d01535b": 500, + "scriptHash-6095e643ea6f1cccb6e463ec34349026b3a48621aac5d512655ab1bf": 500, + "scriptHash-27999ed757d6dac217471ae61d69b1b067b8b240d9e3ff36eb66b5d0": 500, + "scriptHash-87f867a31c0f81360d4d7dcddb6b025ba8383db9bf77a2af7797799d": 500, + "scriptHash-a19a7ba1caede8f3ab3e5e2a928b3798d7d011af18fbd577f7aeb0ec": 500 }, - "threshold": 0.66 + "threshold": 0.67 } } diff --git a/packages/cardano-services/package.json b/packages/cardano-services/package.json index 29b8d96419a..819433a2c0d 100644 --- a/packages/cardano-services/package.json +++ b/packages/cardano-services/package.json @@ -58,7 +58,7 @@ "tscNoEmit": "echo typescript --noEmit command not implemented yet" }, "devDependencies": { - "@cardano-ogmios/client": "6.4.0", + "@cardano-ogmios/client": "6.5.0", "@cardano-sdk/util-dev": "workspace:~", "@types/bunyan": "^1.8.8", "@types/cors": "^2.8.13", diff --git a/packages/core/package.json b/packages/core/package.json index 98e5f754c2e..76971ab87aa 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -54,8 +54,8 @@ } }, "dependencies": { - "@cardano-ogmios/client": "6.4.0", - "@cardano-ogmios/schema": "6.4.0", + "@cardano-ogmios/client": "6.5.0", + "@cardano-ogmios/schema": "6.5.0", "@cardano-sdk/crypto": "workspace:~", "@cardano-sdk/util": "workspace:~", "@cardano-sdk/util-dev": "workspace:~", diff --git a/packages/core/src/CardanoNode/types/CardanoNodeErrors.ts b/packages/core/src/CardanoNode/types/CardanoNodeErrors.ts index f234e6478e6..6374db505f1 100644 --- a/packages/core/src/CardanoNode/types/CardanoNodeErrors.ts +++ b/packages/core/src/CardanoNode/types/CardanoNodeErrors.ts @@ -16,7 +16,8 @@ export enum StateQueryErrorCode { AcquireLedgerStateFailure = 2000, EraMismatch = 2001, UnavailableInCurrentEra = 2002, - AcquiredExpired = 2003 + AcquiredExpired = 2003, + InvalidGenesis = 2004 } export enum TxSubmissionErrorCode { @@ -90,8 +91,10 @@ export enum TxSubmissionErrorCode { * Indeed, if the a UTxO is present in the inputs set, it is already in the transaction context */ ConflictingInputsAndReferences = 3164, - FailureUnrecognizedCertificateType = 3998, - InternalLedgerTypeConversionError = 3999, + UnauthorizedGovernanceAction = 3165, + ReferenceScriptsTooLarge = 3166, + UnknownVoters = 3167, + UnrecognizedCertificateType = 3998, DeserialisationFailure = -32_602 } diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 6b63c76dff0..3d558758f1b 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -36,7 +36,7 @@ "prepack": "yarn build" }, "devDependencies": { - "@cardano-ogmios/schema": "6.4.0", + "@cardano-ogmios/schema": "6.5.0", "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1", "@types/blake2b": "^2.1.0", "@types/libsodium-wrappers-sumo": "^0.7.5", diff --git a/packages/e2e/local-network/Dockerfile b/packages/e2e/local-network/Dockerfile index 6ddaf5ad529..8dce927fc2f 100644 --- a/packages/e2e/local-network/Dockerfile +++ b/packages/e2e/local-network/Dockerfile @@ -5,18 +5,41 @@ FROM ubuntu:${UBUNTU_VERSION} as builder ENV DEBIAN_FRONTEND=nonintercative WORKDIR /build -ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/8.11.0-sancho/cardano-node-8.11.0-linux.tar.gz -ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-8.10.1-aarch64-linux.tar.gz +ARG CARDANO_NODE_BUILD_URL=https://github.com/IntersectMBO/cardano-node/releases/download/9.0.0/cardano-node-9.0.0-linux.tar.gz +ARG CARDANO_CLI_BUILD_URL=https://github.com/IntersectMBO/cardano-cli/releases/download/cardano-cli-9.0.0.1/cardano-cli-9.0.0.1-x86_64-linux.tar.gz +ARG CARDANO_NODE_BUILD_URL_ARM64=https://github.com/input-output-hk/ogmios-tracker/releases/download/0.1.0/cardano-node-9.0.0-aarch64-linux.tar.gz -RUN apt-get update -y && \ - apt-get install -y wget tar curl && \ +# Use local cardano-cli until it is available in the official release +COPY cardano-cli-x86_64-linux.zip cardano-cli-x86_64-linux.zip + +RUN set -x && \ + apt-get update -y && \ + apt-get install -y wget tar curl unzip && \ if [ "$(uname -m)" = "aarch64" ] ; then \ - curl -fsSL "$CARDANO_NODE_BUILD_URL_ARM64" >cardano-node.tar.gz ;\ - else \ - curl -fsSL "$CARDANO_NODE_BUILD_URL" >cardano-node.tar.gz ;\ + curl -fsSL "$CARDANO_NODE_BUILD_URL_ARM64" >cardano-node.tar.gz ;\ + else \ + curl -fsSL "$CARDANO_NODE_BUILD_URL" >cardano-node.tar.gz ;\ fi && \ mkdir -p cardano-node && \ - tar -xzf cardano-node.tar.gz -C cardano-node + tar -xzf cardano-node.tar.gz -C cardano-node && \ + if [ "$(uname -m)" = "x86_64" ] ; then \ + echo "======== Check if we want a custom cardano-cli ========" &&\ + if [ -f cardano-cli-x86_64-linux.zip ] ; then \ + echo "======== Using local cardano-cli ========" && \ + unzip cardano-cli-x86_64-linux.zip ;\ + elif [ -n "$CARDANO_CLI_BUILD_URL" ] ; then \ + echo "======== Using released cardano-cli ========" && \ + curl -fsSL "$CARDANO_CLI_BUILD_URL" >cardano-cli.tar.gz && \ + tar -xzf cardano-cli.tar.gz ;\ + fi && \ + if [ -f cardano-cli-x86_64-linux ] ; then \ + echo "======== Using a custom Cardano Node cardano-cli ========" && \ + chown $(stat -c "%u:%g" cardano-node/bin/cardano-cli) cardano-cli-x86_64-linux && \ + chmod +x cardano-cli-x86_64-linux && \ + mv cardano-cli-x86_64-linux cardano-node/bin/cardano-cli ;\ + fi ;\ + fi + FROM ubuntu:${UBUNTU_VERSION} diff --git a/packages/e2e/local-network/cardano-cli-x86_64-linux.zip b/packages/e2e/local-network/cardano-cli-x86_64-linux.zip new file mode 100644 index 00000000000..c1c2bb9c660 Binary files /dev/null and b/packages/e2e/local-network/cardano-cli-x86_64-linux.zip differ diff --git a/packages/e2e/local-network/templates/babbage/alonzo-babbage-test-genesis.json b/packages/e2e/local-network/templates/babbage/alonzo-babbage-test-genesis.json index c0dfd45440d..7da2f7ef12f 100644 --- a/packages/e2e/local-network/templates/babbage/alonzo-babbage-test-genesis.json +++ b/packages/e2e/local-network/templates/babbage/alonzo-babbage-test-genesis.json @@ -366,7 +366,17 @@ "verifyEd25519Signature-memory-arguments": 10, "verifySchnorrSecp256k1Signature-cpu-arguments-intercept": 38887044, "verifySchnorrSecp256k1Signature-cpu-arguments-slope": 32947, - "verifySchnorrSecp256k1Signature-memory-arguments": 10 + "verifySchnorrSecp256k1Signature-memory-arguments": 10, + "integerToByteString-cpu-arguments-c0": 10, + "integerToByteString-cpu-arguments-c1": 10, + "integerToByteString-cpu-arguments-c2": 10, + "integerToByteString-memory-arguments-intercept": 10, + "integerToByteString-memory-arguments-slope": 10, + "byteStringToInteger-cpu-arguments-c0": 10, + "byteStringToInteger-cpu-arguments-c1": 10, + "byteStringToInteger-cpu-arguments-c2": 10, + "byteStringToInteger-memory-arguments-intercept": 10, + "byteStringToInteger-memory-arguments-slope": 10 } } } \ No newline at end of file diff --git a/packages/e2e/local-network/templates/babbage/conway-babbage-test-genesis.json b/packages/e2e/local-network/templates/babbage/conway-babbage-test-genesis.json index 4accbbab8a4..b9ac0a6b052 100644 --- a/packages/e2e/local-network/templates/babbage/conway-babbage-test-genesis.json +++ b/packages/e2e/local-network/templates/babbage/conway-babbage-test-genesis.json @@ -1,7 +1,7 @@ { "poolVotingThresholds": { - "committeeNormal": 0.6, - "committeeNoConfidence": 0.51, + "committeeNormal": 0.65, + "committeeNoConfidence": 0.65, "hardForkInitiation": 0.51, "motionNoConfidence": 0.6, "ppSecurityGroup": 0.6 @@ -9,7 +9,7 @@ "dRepVotingThresholds": { "motionNoConfidence": 0.67, "committeeNormal": 0.67, - "committeeNoConfidence": 0.6, + "committeeNoConfidence": 0.65, "updateToConstitution": 0.75, "hardForkInitiation": 0.6, "ppNetworkGroup": 0.67, @@ -18,35 +18,280 @@ "ppGovGroup": 0.75, "treasuryWithdrawal": 0.67 }, - "committeeMinSize": 7, - "committeeMaxTermLength": 73, - "govActionLifetime": 6, - "govActionDeposit": 50000000000, + "committeeMinSize": 5, + "committeeMaxTermLength": 146, + "govActionLifetime": 14, + "govActionDeposit": 100000000000, "dRepDeposit": 500000000, "dRepActivity": 20, - "minFeeRefScriptCostPerByte": 44, + "minFeeRefScriptCostPerByte": 15, "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 + 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" + "url": "ipfs://QmQq5hWDNzvDR1ForEktAHrdCQmfSL2u5yctNpzDwoSBu4", + "dataHash": "23b43bebac48a4acc39e578715aa06635d6d900fa3ea7441dfffd6e43b914f7b" } }, "committee": { - "members": {}, + "members": { + "scriptHash-7ceede7d6a89e006408e6b7c6acb3dd094b3f6817e43b4a36d01535b": 500, + "scriptHash-6095e643ea6f1cccb6e463ec34349026b3a48621aac5d512655ab1bf": 500, + "scriptHash-27999ed757d6dac217471ae61d69b1b067b8b240d9e3ff36eb66b5d0": 500, + "scriptHash-87f867a31c0f81360d4d7dcddb6b025ba8383db9bf77a2af7797799d": 500, + "scriptHash-a19a7ba1caede8f3ab3e5e2a928b3798d7d011af18fbd577f7aeb0ec": 500 + }, "threshold": 0.67 } } diff --git a/packages/e2e/local-network/templates/babbage/db-sync-config.json b/packages/e2e/local-network/templates/babbage/db-sync-config.json index 6d4ab1c0ad0..733b54ece5f 100644 --- a/packages/e2e/local-network/templates/babbage/db-sync-config.json +++ b/packages/e2e/local-network/templates/babbage/db-sync-config.json @@ -1,4 +1,5 @@ { + "EnableFutureGenesis" : true, "EnableLogMetrics": false, "EnableLogging": true, "NetworkName": "testnet", diff --git a/packages/e2e/package.json b/packages/e2e/package.json index effbe19cbd4..d3e9cba095f 100644 --- a/packages/e2e/package.json +++ b/packages/e2e/package.json @@ -80,7 +80,7 @@ }, "dependencies": { "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2", - "@cardano-ogmios/client": "6.4.0", + "@cardano-ogmios/client": "6.5.0", "@cardano-sdk/cardano-services": "workspace:~", "@cardano-sdk/cardano-services-client": "workspace:~", "@cardano-sdk/core": "workspace:~", diff --git a/packages/ogmios/package.json b/packages/ogmios/package.json index b6d096b58cd..97e6c180191 100644 --- a/packages/ogmios/package.json +++ b/packages/ogmios/package.json @@ -36,7 +36,7 @@ "prepack": "yarn build" }, "devDependencies": { - "@cardano-ogmios/schema": "6.4.0", + "@cardano-ogmios/schema": "6.5.0", "@cardano-sdk/cardano-services-client": "workspace:~", "@cardano-sdk/util-dev": "workspace:~", "@cardano-sdk/util-rxjs": "workspace:~", @@ -53,8 +53,8 @@ "ws": "^8.5.0" }, "dependencies": { - "@cardano-ogmios/client": "6.4.0", - "@cardano-ogmios/schema": "6.4.0", + "@cardano-ogmios/client": "6.5.0", + "@cardano-ogmios/schema": "6.5.0", "@cardano-sdk/core": "workspace:~", "@cardano-sdk/crypto": "workspace:~", "@cardano-sdk/util": "workspace:~", diff --git a/packages/wallet/package.json b/packages/wallet/package.json index ffd77ab774e..abb3da3a434 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2", - "@cardano-ogmios/client": "6.4.0", + "@cardano-ogmios/client": "6.5.0", "@cardano-sdk/cardano-services-client": "workspace:~", "@cardano-sdk/ogmios": "workspace:~", "@cardano-sdk/util-dev": "workspace:~", diff --git a/yarn-project.nix b/yarn-project.nix index a3dd15b8233..c8d18f59c12 100644 --- a/yarn-project.nix +++ b/yarn-project.nix @@ -382,8 +382,8 @@ cacheEntries = { "@blockfrost/blockfrost-js@npm:5.5.0-beta.0" = { filename = "@blockfrost-blockfrost-js-npm-5.5.0-beta.0-bc07385d7b-193111691d.zip"; sha512 = "193111691d8b5ed44a66484cb6be007ab3b97cf2f10c6a2fdfe191cb40386e08b6dee43354d830959d04bc3ffc8069e2f07e5535da53ddabbd03f18954b6f5b8"; }; "@blockfrost/openapi@npm:0.1.59" = { filename = "@blockfrost-openapi-npm-0.1.59-565be7762f-8846c0bb7e.zip"; sha512 = "8846c0bb7e09388aa79a23795e602304ddd8d17eb8335509330988c3a51063a6e06ec5a0d3278c5ba145f69da2a673913b8aeebae68a99f37b59ebdb2ec3a978"; }; "@cardano-foundation/ledgerjs-hw-app-cardano@npm:7.1.2" = { filename = "@cardano-foundation-ledgerjs-hw-app-cardano-npm-7.1.2-8c3303461b-121d90fa16.zip"; sha512 = "121d90fa16c29dfa2644a3d6583763411246ea52a9ccf72346bf809690fa85d88eb6cec322d4cda2ba39a6e869ebc993a294eb8f8cb34612cfac6a7e8271b9ce"; }; -"@cardano-ogmios/client@npm:6.4.0" = { filename = "@cardano-ogmios-client-npm-6.4.0-0fff791028-d6952ff797.zip"; sha512 = "d6952ff797f42ff0d3e4184f764cca4e699f30b007e62ae1005016c0bb365d387555e4cd448977e5440fce579b9cc2a73c87fa0e4335356a32de43550977d516"; }; -"@cardano-ogmios/schema@npm:6.4.0" = { filename = "@cardano-ogmios-schema-npm-6.4.0-a06f72eac0-40577cfb32.zip"; sha512 = "40577cfb32f5a93315533b82c81cb29fbe55c8b00efac963c5107f6f9d13598b0231090e4a5ada9abaf48bc9f914251f0d7d2df0bf2b9b575ccd0dc6f787348a"; }; +"@cardano-ogmios/client@npm:6.5.0" = { filename = "@cardano-ogmios-client-npm-6.5.0-498603e1f1-7eb68d28a0.zip"; sha512 = "7eb68d28a0e436b026cd2a422152b3242ec66c033ae747d89a0f4d90f89dc6053b825ce7b2e2ab211c8443c1273078882be70e493a0278b6b9bd7c8f992cc68b"; }; +"@cardano-ogmios/schema@npm:6.5.0" = { filename = "@cardano-ogmios-schema-npm-6.5.0-f652d8e468-be5ba6e73f.zip"; sha512 = "be5ba6e73f84fc2ef063bd372068e55bd685afc6b71524423b32cec8e06892f170a9185354588c531ae98168182e1eacfd3620ef10a796d3ae68a3b0331a1de8"; }; "@cardanosolutions/json-bigint@npm:1.0.1" = { filename = "@cardanosolutions-json-bigint-npm-1.0.1-b157608882-cd52446a76.zip"; sha512 = "cd52446a76516c528c69d431c1b593a029e87106968bd2b8e6074761025b77fc18a1b8ae6a10a6e5897446058ca79e0864de6c7d609240275e30cc9f0d2f2fd1"; }; "@colors/colors@npm:1.5.0" = { filename = "@colors-colors-npm-1.5.0-875af3a8b4-d64d5260be.zip"; sha512 = "d64d5260bed1d5012ae3fc617d38d1afc0329fec05342f4e6b838f46998855ba56e0a73833f4a80fa8378c84810da254f76a8a19c39d038260dc06dc4e007425"; }; "@commitlint/cli@npm:13.2.1" = { filename = "@commitlint-cli-npm-13.2.1-0a46dd618d-41b74874ec.zip"; sha512 = "41b74874ec3e3b1da69f07710ea080654017d6e9a73d98d06c061259bb255e09a4870a516da0ee92f86776f030e608eb797cdd44dac804c39f2f32e798e81a60"; }; @@ -2589,6 +2589,7 @@ cacheEntries = { "write-pkg@npm:5.1.0" = { filename = "write-pkg-npm-5.1.0-1862488fb5-b29138f274.zip"; sha512 = "b29138f27450c64ce0f3bb250e04f5696efb7ed8583be96ca25cc50d3aa4913851d8dc501f655dd40c922ebb02c36d73221b85263e48bdbea4c9c33ffe9bfef4"; }; "write-stream@npm:0.4.3" = { filename = "write-stream-npm-0.4.3-d522c0a8e7-b5ad4421fe.zip"; sha512 = "b5ad4421fee1a9aeb5a9ad6f035b9b48a80d9c6664dbc3900f7f51a588978d7fc592a13f043648cf6b988ba247fa8c712d7f1e6b9639b634642133983290cc4f"; }; "ws@npm:5.2.3" = { filename = "ws-npm-5.2.3-b2f5e4219f-bdb2223a40.zip"; sha512 = "bdb2223a40c2c68cf91b25a6c9b8c67d5275378ec6187f343314d3df7530e55b77cb9fe79fb1c6a9758389ac5aefc569d24236924b5c65c5dbbaff409ef739fc"; }; +"ws@npm:7.5.10" = { filename = "ws-npm-7.5.10-878ccb886b-f9bb062abf.zip"; sha512 = "f9bb062abf54cc8f02d94ca86dcd349c3945d63851f5d07a3a61c2fcb755b15a88e943a63cf580cbdb5b74436d67ef6b67f745b8f7c0814e411379138e1863cb"; }; "ws@npm:7.5.9" = { filename = "ws-npm-7.5.9-26f12a5ed6-c3c100a181.zip"; sha512 = "c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138"; }; "ws@npm:8.10.0" = { filename = "ws-npm-8.10.0-053bb23547-3a32e15dff.zip"; sha512 = "3a32e15dffe633dd5ce99659793dbcf1440ea25d2da1060c88cbd22efdfb7986a6933e68aaa4b098fc3f1f7870cb386afd378a1ceaca4b31748471576d5a8b52"; }; "ws@npm:8.2.3" = { filename = "ws-npm-8.2.3-03a35b8ad7-c869296ccb.zip"; sha512 = "c869296ccb45f218ac6d32f8f614cd85b50a21fd434caf11646008eef92173be53490810c5c23aea31bc527902261fbfd7b062197eea341b26128d4be56a85e4"; }; diff --git a/yarn.lock b/yarn.lock index 7f34069aaf3..e0b241017a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3065,11 +3065,11 @@ __metadata: languageName: node linkType: hard -"@cardano-ogmios/client@npm:6.4.0": - version: 6.4.0 - resolution: "@cardano-ogmios/client@npm:6.4.0" +"@cardano-ogmios/client@npm:6.5.0": + version: 6.5.0 + resolution: "@cardano-ogmios/client@npm:6.5.0" dependencies: - "@cardano-ogmios/schema": 6.4.0 + "@cardano-ogmios/schema": 6.5.0 "@cardanosolutions/json-bigint": ^1.0.1 "@types/json-bigint": ^1.0.1 bech32: ^2.0.0 @@ -3078,15 +3078,15 @@ __metadata: isomorphic-ws: ^4.0.1 nanoid: ^3.1.31 ts-custom-error: ^3.2.0 - ws: ^7.4.6 - checksum: d6952ff797f42ff0d3e4184f764cca4e699f30b007e62ae1005016c0bb365d387555e4cd448977e5440fce579b9cc2a73c87fa0e4335356a32de43550977d516 + ws: ^7.5.10 + checksum: 7eb68d28a0e436b026cd2a422152b3242ec66c033ae747d89a0f4d90f89dc6053b825ce7b2e2ab211c8443c1273078882be70e493a0278b6b9bd7c8f992cc68b languageName: node linkType: hard -"@cardano-ogmios/schema@npm:6.4.0": - version: 6.4.0 - resolution: "@cardano-ogmios/schema@npm:6.4.0" - checksum: 40577cfb32f5a93315533b82c81cb29fbe55c8b00efac963c5107f6f9d13598b0231090e4a5ada9abaf48bc9f914251f0d7d2df0bf2b9b575ccd0dc6f787348a +"@cardano-ogmios/schema@npm:6.5.0": + version: 6.5.0 + resolution: "@cardano-ogmios/schema@npm:6.5.0" + checksum: be5ba6e73f84fc2ef063bd372068e55bd685afc6b71524423b32cec8e06892f170a9185354588c531ae98168182e1eacfd3620ef10a796d3ae68a3b0331a1de8 languageName: node linkType: hard @@ -3120,7 +3120,7 @@ __metadata: resolution: "@cardano-sdk/cardano-services@workspace:packages/cardano-services" dependencies: "@blockfrost/blockfrost-js": 5.5.0-beta.0 - "@cardano-ogmios/client": 6.4.0 + "@cardano-ogmios/client": 6.5.0 "@cardano-sdk/cardano-services-client": "workspace:~" "@cardano-sdk/core": "workspace:~" "@cardano-sdk/crypto": "workspace:~" @@ -3195,8 +3195,8 @@ __metadata: version: 0.0.0-use.local resolution: "@cardano-sdk/core@workspace:packages/core" dependencies: - "@cardano-ogmios/client": 6.4.0 - "@cardano-ogmios/schema": 6.4.0 + "@cardano-ogmios/client": 6.5.0 + "@cardano-ogmios/schema": 6.5.0 "@cardano-sdk/crypto": "workspace:~" "@cardano-sdk/util": "workspace:~" "@cardano-sdk/util-dev": "workspace:~" @@ -3229,7 +3229,7 @@ __metadata: version: 0.0.0-use.local resolution: "@cardano-sdk/crypto@workspace:packages/crypto" dependencies: - "@cardano-ogmios/schema": 6.4.0 + "@cardano-ogmios/schema": 6.5.0 "@cardano-sdk/util": "workspace:~" "@dcspark/cardano-multiplatform-lib-nodejs": ^3.1.1 "@types/blake2b": ^2.1.0 @@ -3296,7 +3296,7 @@ __metadata: "@babel/preset-env": ^7.18.2 "@babel/preset-typescript": ^7.17.12 "@cardano-foundation/ledgerjs-hw-app-cardano": ^7.1.2 - "@cardano-ogmios/client": 6.4.0 + "@cardano-ogmios/client": 6.5.0 "@cardano-sdk/cardano-services": "workspace:~" "@cardano-sdk/cardano-services-client": "workspace:~" "@cardano-sdk/core": "workspace:~" @@ -3557,8 +3557,8 @@ __metadata: version: 0.0.0-use.local resolution: "@cardano-sdk/ogmios@workspace:packages/ogmios" dependencies: - "@cardano-ogmios/client": 6.4.0 - "@cardano-ogmios/schema": 6.4.0 + "@cardano-ogmios/client": 6.5.0 + "@cardano-ogmios/schema": 6.5.0 "@cardano-sdk/cardano-services-client": "workspace:~" "@cardano-sdk/core": "workspace:~" "@cardano-sdk/crypto": "workspace:~" @@ -3741,7 +3741,7 @@ __metadata: resolution: "@cardano-sdk/wallet@workspace:packages/wallet" dependencies: "@cardano-foundation/ledgerjs-hw-app-cardano": ^7.1.2 - "@cardano-ogmios/client": 6.4.0 + "@cardano-ogmios/client": 6.5.0 "@cardano-sdk/cardano-services-client": "workspace:~" "@cardano-sdk/core": "workspace:~" "@cardano-sdk/crypto": "workspace:~" @@ -26013,7 +26013,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:7.5.9, ws@npm:^7.2.0, ws@npm:^7.4.5, ws@npm:^7.4.6, ws@npm:^7.5.7": +"ws@npm:7.5.9, ws@npm:^7.2.0, ws@npm:^7.4.5, ws@npm:^7.5.7": version: 7.5.9 resolution: "ws@npm:7.5.9" peerDependencies: @@ -26052,6 +26052,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:^7.5.10": + version: 7.5.10 + resolution: "ws@npm:7.5.10" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: f9bb062abf54cc8f02d94ca86dcd349c3945d63851f5d07a3a61c2fcb755b15a88e943a63cf580cbdb5b74436d67ef6b67f745b8f7c0814e411379138e1863cb + languageName: node + linkType: hard + "ws@npm:^8.2.3, ws@npm:^8.5.0": version: 8.10.0 resolution: "ws@npm:8.10.0"