From 73a98ccefdca2ec33680e109990fc9b51eeab3fd Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 17 Oct 2023 15:59:40 -0500 Subject: [PATCH 01/10] imp: migrate sancho to play dns --- cardano-lib/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index 6d889075..5ff6c255 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -209,20 +209,20 @@ let sanchonet = rec { useByronWallet = false; private = false; - domain = "world.dev.cardano.org"; - relaysNew = "sanchonet-node.world.dev.cardano.org"; - explorerUrl = "https://sanchonet-explorer.world.dev.cardano.org"; - smashUrl = "https://sanchonet-smash.world.dev.cardano.org"; - metadataUrl = "https://metadata.world.dev.cardano.org"; + domain = "play.dev.cardano.org"; + relaysNew = "sanchonet-node.play.dev.cardano.org"; + explorerUrl = "https://sanchonet-explorer.play.dev.cardano.org"; + smashUrl = "https://sanchonet-smash.play.dev.cardano.org"; + metadataUrl = "https://metadata.play.dev.cardano.org"; edgeNodes = [ { addr = relaysNew; - port = 30004; + port = 3001; } ]; - edgePort = 30004; + edgePort = 3001; networkConfig = import ./sanchonet-config.nix; - usePeersFromLedgerAfterSlot = 8877900; + usePeersFromLedgerAfterSlot = 10800600; }; private = rec { From a7d2f7200c4739542b5e37e35b722ce2211a12df Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 24 Oct 2023 18:42:56 -0500 Subject: [PATCH 02/10] imp: migrate preview except for metadata svr to play dns --- cardano-lib/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index 5ff6c255..d9c890db 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -185,10 +185,10 @@ let preview = rec { useByronWallet = false; private = false; - domain = "world.dev.cardano.org"; - relaysNew = "preview-node.world.dev.cardano.org"; - explorerUrl = "https://preview-explorer.world.dev.cardano.org"; - smashUrl = "https://preview-smash.world.dev.cardano.org"; + domain = "play.dev.cardano.org"; + relaysNew = "preview-node.play.dev.cardano.org"; + explorerUrl = "https://preview-explorer.play.dev.cardano.org"; + smashUrl = "https://preview-smash.play.dev.cardano.org"; metadataUrl = "https://metadata.world.dev.cardano.org"; mithrilAggregatorEndpointUrl = "https://aggregator.pre-release-preview.api.mithril.network/aggregator"; mithrilEraReaderParams = { @@ -198,12 +198,12 @@ let edgeNodes = [ { addr = relaysNew; - port = 30002; + port = 3001; } ]; - edgePort = 30002; + edgePort = 3001; networkConfig = import ./preview-config.nix; - usePeersFromLedgerAfterSlot = 322000; + usePeersFromLedgerAfterSlot = 31536600; }; sanchonet = rec { From 504f0c9780462bb71bffd5db87ccc4b07eb33a5f Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 27 Oct 2023 10:12:58 -0500 Subject: [PATCH 03/10] imp: migrate shelley-qa, private to play, plus preview metadata --- cardano-lib/default.nix | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index d9c890db..0c55eb5a 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -128,20 +128,20 @@ let shelley_qa = rec { useByronWallet = false; private = true; - domain = "world.dev.cardano.org"; - relaysNew = "shelley-qa-node.world.dev.cardano.org"; - explorerUrl = "https://shelley-qa-explorer.world.dev.cardano.org"; - smashUrl = "https://shelley-qa-smash.world.dev.cardano.org"; - metadataUrl = "https://metadata.world.dev.cardano.org"; + domain = "play.dev.cardano.org"; + relaysNew = "shelley-qa-node.play.dev.cardano.org"; + explorerUrl = "https://shelley-qa-explorer.play.dev.cardano.org"; + smashUrl = "https://shelley-qa-smash.play.dev.cardano.org"; + metadataUrl = "https://metadata.play.dev.cardano.org"; edgeNodes = [ { addr = relaysNew; - port = 30003; + port = 3001; } ]; - edgePort = 30003; + edgePort = 3001; networkConfig = import ./shelley_qa-config.nix; - usePeersFromLedgerAfterSlot = 32000; + usePeersFromLedgerAfterSlot = 9208700; }; p2p = rec { @@ -189,7 +189,7 @@ let relaysNew = "preview-node.play.dev.cardano.org"; explorerUrl = "https://preview-explorer.play.dev.cardano.org"; smashUrl = "https://preview-smash.play.dev.cardano.org"; - metadataUrl = "https://metadata.world.dev.cardano.org"; + metadataUrl = "https://metadata.play.dev.cardano.org"; mithrilAggregatorEndpointUrl = "https://aggregator.pre-release-preview.api.mithril.network/aggregator"; mithrilEraReaderParams = { address = "addr_test1qrv5xfwh043mlc3vk5d97s4nmhxu7cmleyssvhx37gkfyejfe8d38v3vsfgetjafgrsdc49krug8wf04h5rmtengtejqlxrksk"; @@ -228,18 +228,18 @@ let private = rec { useByronWallet = false; private = true; - domain = "world.dev.cardano.org"; - relaysNew = "private-node.world.dev.cardano.org"; - explorerUrl = "https://private-explorer.world.dev.cardano.org"; - smashUrl = "https://private-smash.world.dev.cardano.org"; - metadataUrl = "https://metadata.world.dev.cardano.org"; + domain = "play.dev.cardano.org"; + relaysNew = "private-node.play.dev.cardano.org"; + explorerUrl = "https://private-explorer.play.dev.cardano.org"; + smashUrl = "https://private-smash.play.dev.cardano.org"; + metadataUrl = "https://metadata.play.dev.cardano.org"; edgeNodes = [ { addr = relaysNew; - port = 30007; + port = 3001; } ]; - edgePort = 30007; + edgePort = 3001; networkConfig = import ./private-config.nix; usePeersFromLedgerAfterSlot = 32000; }; From db5be77f1ec9fdede5607d91ee94d56bbe0e1cff Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 27 Oct 2023 10:14:32 -0500 Subject: [PATCH 04/10] imp: rm deprecated p2p network --- cardano-lib/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index 0c55eb5a..a40571ac 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -144,20 +144,6 @@ let usePeersFromLedgerAfterSlot = 9208700; }; - p2p = rec { - useByronWallet = false; - private = false; - domain = "p2p.dev.cardano.org"; - relaysNew = "relays.p2p.dev.cardano.org"; - explorerUrl = "https://explorer.p2p.dev.cardano.org"; - smashUrl = "https://smash.p2p.dev.cardano.org"; - metadataUrl = "https://metadata.world.dev.cardano.org"; - edgeNodes = []; - edgePort = 3001; - networkConfig = import ./p2p-config.nix; - usePeersFromLedgerAfterSlot = 14680; - }; - preprod = rec { useByronWallet = false; private = false; From 0c29877e53d196c3735623dca671f130ceab0275 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Mon, 30 Oct 2023 12:29:54 -0500 Subject: [PATCH 05/10] migrate preprod to play dns --- cardano-lib/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index a40571ac..48754e8a 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -147,11 +147,11 @@ let preprod = rec { useByronWallet = false; private = false; - domain = "world.dev.cardano.org"; - relaysNew = "preprod-node.world.dev.cardano.org"; - explorerUrl = "https://preprod-explorer.world.dev.cardano.org"; - smashUrl = "https://preprod-smash.world.dev.cardano.org"; - metadataUrl = "https://metadata.world.dev.cardano.org"; + domain = "play.dev.cardano.org"; + relaysNew = "preprod-node.play.dev.cardano.org"; + explorerUrl = "https://preprod-explorer.play.dev.cardano.org"; + smashUrl = "https://preprod-smash.play.dev.cardano.org"; + metadataUrl = "https://metadata.play.dev.cardano.org"; mithrilAggregatorEndpointUrl = "https://aggregator.release-preprod.api.mithril.network/aggregator"; mithrilEraReaderParams = { address = "addr_test1qpkyv2ws0deszm67t840sdnruqgr492n80g3y96xw3p2ksk6suj5musy6w8lsg3yjd09cnpgctc2qh386rtxphxt248qr0npnx"; @@ -160,12 +160,12 @@ let edgeNodes = [ { addr = relaysNew; - port = 30000; + port = 3001; } ]; - edgePort = 30000; + edgePort = 3001; networkConfig = import ./preprod-config.nix; - usePeersFromLedgerAfterSlot = 4642000; + usePeersFromLedgerAfterSlot = 42855241; }; preview = rec { From 717202044640f9fd9eed5ff3810f8fff6b04aadf Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Mon, 30 Oct 2023 13:58:33 -0500 Subject: [PATCH 06/10] imp: rm deprecated p2p config files --- cardano-lib/p2p-config.nix | 52 ------- cardano-lib/p2p/alonzo-genesis.json | 196 --------------------------- cardano-lib/p2p/byron-genesis.json | 40 ------ cardano-lib/p2p/conway-genesis.json | 37 ----- cardano-lib/p2p/shelley-genesis.json | 44 ------ 5 files changed, 369 deletions(-) delete mode 100644 cardano-lib/p2p-config.nix delete mode 100644 cardano-lib/p2p/alonzo-genesis.json delete mode 100644 cardano-lib/p2p/byron-genesis.json delete mode 100644 cardano-lib/p2p/conway-genesis.json delete mode 100644 cardano-lib/p2p/shelley-genesis.json diff --git a/cardano-lib/p2p-config.nix b/cardano-lib/p2p-config.nix deleted file mode 100644 index c339b2d0..00000000 --- a/cardano-lib/p2p-config.nix +++ /dev/null @@ -1,52 +0,0 @@ -########################################################## -############### P2P Testnet ############### -############### Cardano Node Configuration ############### -########################################################## - -{ - ##### Locations ##### - - ByronGenesisFile = ./p2p + "/byron-genesis.json"; - ByronGenesisHash = "414e27b56b4b147e40bd95cc5552a2c97043c04e3de8b4c7ea5fc90fce25a68e"; - ShelleyGenesisFile = ./p2p + "/shelley-genesis.json"; - ShelleyGenesisHash = "a0e8e5520ab7c452c4e36020ded12c791a10abd7ca25c083af6149fe269ddb67"; - AlonzoGenesisFile = ./p2p + "/alonzo-genesis.json"; - AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874"; - ConwayGenesisFile = ./p2p + "/conway-genesis.json"; - ConwayGenesisHash = "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6"; - - ##### Core protocol parameters ##### - - # This is the instance of the Ouroboros family that we are running. - # The node also supports various test and mock instances. - # "RealPBFT" is the real (ie not mock) (permissive) OBFT protocol, which - # is what we use on mainnet in Byron era. - Protocol = "Cardano"; - - PBftSignatureThreshold = 1.1; - # The mainnet does not include the network magic into addresses. Testnets do. - RequiresNetworkMagic = "RequiresMagic"; - - TestShelleyHardForkAtEpoch = 1; - TestAllegraHardForkAtEpoch = 2; - TestMaryHardForkAtEpoch = 3; - TestAlonzoHardForkAtEpoch = 4; - - ### P2P - - EnableP2P = true; - TraceInboundGovernorCounters = true; - - MaxKnownMajorProtocolVersion = 2; - #### LOGGING Debug - - minSeverity = "Debug"; - - ##### Update system parameters ##### - - # This protocol version number gets used by block producing nodes as part - # part of the system for agreeing on and synchronising protocol updates. - LastKnownBlockVersion-Major = 3; - LastKnownBlockVersion-Minor = 1; - LastKnownBlockVersion-Alt = 0; -} diff --git a/cardano-lib/p2p/alonzo-genesis.json b/cardano-lib/p2p/alonzo-genesis.json deleted file mode 100644 index 0fd90dee..00000000 --- a/cardano-lib/p2p/alonzo-genesis.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "lovelacePerUTxOWord": 34482, - "executionPrices": { - "prSteps": - { - "numerator" : 721, - "denominator" : 10000000 - }, - "prMem": - { - "numerator" : 577, - "denominator" : 10000 - } - }, - "maxTxExUnits": { - "exUnitsMem": 10000000, - "exUnitsSteps": 10000000000 - }, - "maxBlockExUnits": { - "exUnitsMem": 50000000, - "exUnitsSteps": 40000000000 - }, - "maxValueSize": 5000, - "collateralPercentage": 150, - "maxCollateralInputs": 3, - "costModels": { - "PlutusV1": { - "sha2_256-memory-arguments": 4, - "equalsString-cpu-arguments-constant": 1000, - "cekDelayCost-exBudgetMemory": 100, - "lessThanEqualsByteString-cpu-arguments-intercept": 103599, - "divideInteger-memory-arguments-minimum": 1, - "appendByteString-cpu-arguments-slope": 621, - "blake2b-cpu-arguments-slope": 29175, - "iData-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-slope": 1000, - "unBData-cpu-arguments": 150000, - "multiplyInteger-cpu-arguments-intercept": 61516, - "cekConstCost-exBudgetMemory": 100, - "nullList-cpu-arguments": 150000, - "equalsString-cpu-arguments-intercept": 150000, - "trace-cpu-arguments": 150000, - "mkNilData-memory-arguments": 32, - "lengthOfByteString-cpu-arguments": 150000, - "cekBuiltinCost-exBudgetCPU": 29773, - "bData-cpu-arguments": 150000, - "subtractInteger-cpu-arguments-slope": 0, - "unIData-cpu-arguments": 150000, - "consByteString-memory-arguments-intercept": 0, - "divideInteger-memory-arguments-slope": 1, - "divideInteger-cpu-arguments-model-arguments-slope": 118, - "listData-cpu-arguments": 150000, - "headList-cpu-arguments": 150000, - "chooseData-memory-arguments": 32, - "equalsInteger-cpu-arguments-intercept": 136542, - "sha3_256-cpu-arguments-slope": 82363, - "sliceByteString-cpu-arguments-slope": 5000, - "unMapData-cpu-arguments": 150000, - "lessThanInteger-cpu-arguments-intercept": 179690, - "mkCons-cpu-arguments": 150000, - "appendString-memory-arguments-intercept": 0, - "modInteger-cpu-arguments-model-arguments-slope": 118, - "ifThenElse-cpu-arguments": 1, - "mkNilPairData-cpu-arguments": 150000, - "lessThanEqualsInteger-cpu-arguments-intercept": 145276, - "addInteger-memory-arguments-slope": 1, - "chooseList-memory-arguments": 32, - "constrData-memory-arguments": 32, - "decodeUtf8-cpu-arguments-intercept": 150000, - "equalsData-memory-arguments": 1, - "subtractInteger-memory-arguments-slope": 1, - "appendByteString-memory-arguments-intercept": 0, - "lengthOfByteString-memory-arguments": 4, - "headList-memory-arguments": 32, - "listData-memory-arguments": 32, - "consByteString-cpu-arguments-intercept": 150000, - "unIData-memory-arguments": 32, - "remainderInteger-memory-arguments-minimum": 1, - "bData-memory-arguments": 32, - "lessThanByteString-cpu-arguments-slope": 248, - "encodeUtf8-memory-arguments-intercept": 0, - "cekStartupCost-exBudgetCPU": 100, - "multiplyInteger-memory-arguments-intercept": 0, - "unListData-memory-arguments": 32, - "remainderInteger-cpu-arguments-model-arguments-slope": 118, - "cekVarCost-exBudgetCPU": 29773, - "remainderInteger-memory-arguments-slope": 1, - "cekForceCost-exBudgetCPU": 29773, - "sha2_256-cpu-arguments-slope": 29175, - "equalsInteger-memory-arguments": 1, - "indexByteString-memory-arguments": 1, - "addInteger-memory-arguments-intercept": 1, - "chooseUnit-cpu-arguments": 150000, - "sndPair-cpu-arguments": 150000, - "cekLamCost-exBudgetCPU": 29773, - "fstPair-cpu-arguments": 150000, - "quotientInteger-memory-arguments-minimum": 1, - "decodeUtf8-cpu-arguments-slope": 1000, - "lessThanInteger-memory-arguments": 1, - "lessThanEqualsInteger-cpu-arguments-slope": 1366, - "fstPair-memory-arguments": 32, - "modInteger-memory-arguments-intercept": 0, - "unConstrData-cpu-arguments": 150000, - "lessThanEqualsInteger-memory-arguments": 1, - "chooseUnit-memory-arguments": 32, - "sndPair-memory-arguments": 32, - "addInteger-cpu-arguments-intercept": 197209, - "decodeUtf8-memory-arguments-slope": 8, - "equalsData-cpu-arguments-intercept": 150000, - "mapData-cpu-arguments": 150000, - "mkPairData-cpu-arguments": 150000, - "quotientInteger-cpu-arguments-constant": 148000, - "consByteString-memory-arguments-slope": 1, - "cekVarCost-exBudgetMemory": 100, - "indexByteString-cpu-arguments": 150000, - "unListData-cpu-arguments": 150000, - "equalsInteger-cpu-arguments-slope": 1326, - "cekStartupCost-exBudgetMemory": 100, - "subtractInteger-cpu-arguments-intercept": 197209, - "divideInteger-cpu-arguments-model-arguments-intercept": 425507, - "divideInteger-memory-arguments-intercept": 0, - "cekForceCost-exBudgetMemory": 100, - "blake2b-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-constant": 148000, - "tailList-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-intercept": 150000, - "equalsString-cpu-arguments-slope": 1000, - "lessThanByteString-memory-arguments": 1, - "multiplyInteger-cpu-arguments-slope": 11218, - "appendByteString-cpu-arguments-intercept": 396231, - "lessThanEqualsByteString-cpu-arguments-slope": 248, - "modInteger-memory-arguments-slope": 1, - "addInteger-cpu-arguments-slope": 0, - "equalsData-cpu-arguments-slope": 10000, - "decodeUtf8-memory-arguments-intercept": 0, - "chooseList-cpu-arguments": 150000, - "constrData-cpu-arguments": 150000, - "equalsByteString-memory-arguments": 1, - "cekApplyCost-exBudgetCPU": 29773, - "quotientInteger-memory-arguments-slope": 1, - "verifySignature-cpu-arguments-intercept": 3345831, - "unMapData-memory-arguments": 32, - "mkCons-memory-arguments": 32, - "sliceByteString-memory-arguments-slope": 1, - "sha3_256-memory-arguments": 4, - "ifThenElse-memory-arguments": 1, - "mkNilPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-slope": 247, - "appendString-cpu-arguments-intercept": 150000, - "quotientInteger-cpu-arguments-model-arguments-slope": 118, - "cekApplyCost-exBudgetMemory": 100, - "equalsString-memory-arguments": 1, - "multiplyInteger-memory-arguments-slope": 1, - "cekBuiltinCost-exBudgetMemory": 100, - "remainderInteger-memory-arguments-intercept": 0, - "sha2_256-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-model-arguments-intercept": 425507, - "lessThanEqualsByteString-memory-arguments": 1, - "tailList-memory-arguments": 32, - "mkNilData-cpu-arguments": 150000, - "chooseData-cpu-arguments": 150000, - "unBData-memory-arguments": 32, - "blake2b-memory-arguments": 4, - "iData-memory-arguments": 32, - "nullList-memory-arguments": 32, - "cekDelayCost-exBudgetCPU": 29773, - "subtractInteger-memory-arguments-intercept": 1, - "lessThanByteString-cpu-arguments-intercept": 103599, - "consByteString-cpu-arguments-slope": 1000, - "appendByteString-memory-arguments-slope": 1, - "trace-memory-arguments": 32, - "divideInteger-cpu-arguments-constant": 148000, - "cekConstCost-exBudgetCPU": 29773, - "encodeUtf8-memory-arguments-slope": 8, - "quotientInteger-cpu-arguments-model-arguments-intercept": 425507, - "mapData-memory-arguments": 32, - "appendString-cpu-arguments-slope": 1000, - "modInteger-cpu-arguments-constant": 148000, - "verifySignature-cpu-arguments-slope": 1, - "unConstrData-memory-arguments": 32, - "quotientInteger-memory-arguments-intercept": 0, - "equalsByteString-cpu-arguments-constant": 150000, - "sliceByteString-memory-arguments-intercept": 0, - "mkPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-intercept": 112536, - "appendString-memory-arguments-slope": 1, - "lessThanInteger-cpu-arguments-slope": 497, - "modInteger-cpu-arguments-model-arguments-intercept": 425507, - "modInteger-memory-arguments-minimum": 1, - "sha3_256-cpu-arguments-intercept": 0, - "verifySignature-memory-arguments": 1, - "cekLamCost-exBudgetMemory": 100, - "sliceByteString-cpu-arguments-intercept": 150000 - } - } -} diff --git a/cardano-lib/p2p/byron-genesis.json b/cardano-lib/p2p/byron-genesis.json deleted file mode 100644 index 3d69134b..00000000 --- a/cardano-lib/p2p/byron-genesis.json +++ /dev/null @@ -1,40 +0,0 @@ -{ "bootStakeholders": - { "6d2fdc9c6b8421d26090212f8a2abd7275c016fcaf792ca1db8175a2": 1 } -, "heavyDelegation": - { "6d2fdc9c6b8421d26090212f8a2abd7275c016fcaf792ca1db8175a2": - { "omega": 0 - , "issuerPk": - "I1Cznv1YAHODnua/JTA4sN8GrH+5E57EoViRU3bZBAiKKvBFyS4kFLdmrEUH/EyrWnIPAA1bmOJ2iY9CUUseOQ==" - , "delegatePk": - "QfpaPA/dudazdAlLI/il14IC+n0jbeMSNlNzF6vXFpvSI87mWvH+7FJ9I9E2XyAA4xtmZgB/6CM0Jd9QW6kzyA==" - , "cert": - "98e6dfe77fb33d7008203571e107640ab0a85ee863734237ede8ea39f1f8b96611a1d51c8160b2214928b355d49a82325fae2c2780852fc19f06b273ed11e007" - } } -, "startTime": 1631288447 -, "nonAvvmBalances": - { "FHnt4NL7yPYFafGgMQ4jdsWkKkvmF1HCDXZFWwGNKeDGJsKiVxLNeuxJnDFJrrV": - "30000015000000000" } -, "blockVersionData": - { "scriptVersion": 0 - , "slotDuration": "20000" - , "maxBlockSize": "2000000" - , "maxHeaderSize": "2000000" - , "maxTxSize": "4096" - , "maxProposalSize": "700" - , "mpcThd": "20000000000000" - , "heavyDelThd": "300000000000" - , "updateVoteThd": "1000000000000" - , "updateProposalThd": "100000000000000" - , "updateImplicit": "10000" - , "softforkRule": - { "initThd": "900000000000000" - , "minThd": "600000000000000" - , "thdDecrement": "50000000000000" - } - , "txFeePolicy": - { "summand": "155381000000000" , "multiplier": "43946000000" } - , "unlockStakeEpoch": "18446744073709551615" - } -, "protocolConsts": { "k": 36 , "protocolMagic": 4 } -, "avvmDistr": {} -} \ No newline at end of file diff --git a/cardano-lib/p2p/conway-genesis.json b/cardano-lib/p2p/conway-genesis.json deleted file mode 100644 index 078d33b1..00000000 --- a/cardano-lib/p2p/conway-genesis.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "poolVotingThresholds": { - "pvtCommitteeNormal": 0.51, - "pvtCommitteeNoConfidence": 0.51, - "pvtHardForkInitiation": 0.51, - "pvtMotionNoConfidence": 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 - }, - "committeeMinSize": 0, - "committeeMaxTermLength": 60, - "govActionLifetime": 14, - "govActionDeposit": 0, - "dRepDeposit": 0, - "dRepActivity": 0, - "constitution": { - "anchor": { - "url": "", - "dataHash": "0000000000000000000000000000000000000000000000000000000000000000" - } - }, - "committee": { - "members": { - }, - "quorum": 0 - } -} diff --git a/cardano-lib/p2p/shelley-genesis.json b/cardano-lib/p2p/shelley-genesis.json deleted file mode 100644 index b712c4eb..00000000 --- a/cardano-lib/p2p/shelley-genesis.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maxLovelaceSupply": 45000000000000000, - "securityParam": 36, - "slotsPerKESPeriod": 129600, - "updateQuorum": 1, - "activeSlotsCoeff": 5.0e-2, - "protocolParams": { - "minUTxOValue": 1000000, - "eMax": 18, - "extraEntropy": { - "tag": "NeutralNonce" - }, - "minFeeB": 155381, - "tau": 0.2, - "maxBlockBodySize": 65536, - "maxTxSize": 16384, - "minPoolCost": 340000000, - "minFeeA": 44, - "nOpt": 150, - "maxBlockHeaderSize": 1100, - "keyDeposit": 2000000, - "poolDeposit": 500000000, - "protocolVersion": { - "minor": 0, - "major": 2 - }, - "a0": 0.3, - "rho": 3.0e-3, - "decentralisationParam": 0.25 - }, - "networkMagic": 4, - "initialFunds": {}, - "networkId": "Testnet", - "maxKESEvolutions": 62, - "genDelegs": { - "ade76c3577b4ea58f5081dfcc8b92af37f1c31d3680bb7703d9c189f": { - "delegate": "9ff5d99c1b4ba934f80913ac8c4a7bb94af2ae0367b61dbd39d30ed7", - "vrf": "786e48aad33d21a82201f390ce8eea0649e08e4407425073484426beec5a48d2" - } - }, - "slotLength": 1, - "systemStart": "2021-09-10T15:40:47Z", - "epochLength": 7200 -} From f6eeef2e23a4bf80e17b6df7ac5d76fee6e8037c Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Sat, 28 Oct 2023 03:13:48 -0500 Subject: [PATCH 07/10] imp: update private chain --- cardano-lib/private-config.nix | 15 +- cardano-lib/private/alonzo-genesis.json | 370 +++++++++++------------ cardano-lib/private/byron-genesis.json | 129 ++++---- cardano-lib/private/shelley-genesis.json | 22 +- 4 files changed, 260 insertions(+), 276 deletions(-) diff --git a/cardano-lib/private-config.nix b/cardano-lib/private-config.nix index 35c0babb..e90f8eb7 100644 --- a/cardano-lib/private-config.nix +++ b/cardano-lib/private-config.nix @@ -7,11 +7,11 @@ ##### Locations ##### ByronGenesisFile = ./private + "/byron-genesis.json"; - ByronGenesisHash = "9a2d021950a717b48ee26079178ea0740e2b67ee9bcfcf4623f81f7c66d7c583"; + ByronGenesisHash = "1c49093e43757a7f5d55791ee8682d2681e7a291b10dadc663ac1889b3f16984"; ShelleyGenesisFile = ./private + "/shelley-genesis.json"; - ShelleyGenesisHash = "d9d01796f5cfab8da3833dd98d15b3967fecb52ab75df9f0267be7888d535ead"; + ShelleyGenesisHash = "136177de30fc5d431cc80f5789089486c13629e589dd705aa4254f765a84582b"; AlonzoGenesisFile = ./private + "/alonzo-genesis.json"; - AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874"; + AlonzoGenesisHash = "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec"; ConwayGenesisFile = ./private + "/conway-genesis.json"; ConwayGenesisHash = "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6"; @@ -24,15 +24,14 @@ TargetNumberOfKnownPeers = 100; TargetNumberOfRootPeers = 100; ExperimentalHardForksEnabled = true; - ExperimentalProtocolsEnabled = false; + ExperimentalProtocolsEnabled = true; TestShelleyHardForkAtEpoch = 0; TestAllegraHardForkAtEpoch = 0; - TestMaryHardForkAtEpoch = 0; TestAlonzoHardForkAtEpoch = 0; - + TestMaryHardForkAtEpoch = 0; ##### Update system Parameters ##### - LastKnownBlockVersion-Major = 6; - LastKnownBlockVersion-Minor = 0; + LastKnownBlockVersion-Major = 3; + LastKnownBlockVersion-Minor = 1; LastKnownBlockVersion-Alt = 0; } diff --git a/cardano-lib/private/alonzo-genesis.json b/cardano-lib/private/alonzo-genesis.json index 0fd90dee..de05d3d9 100644 --- a/cardano-lib/private/alonzo-genesis.json +++ b/cardano-lib/private/alonzo-genesis.json @@ -1,196 +1,188 @@ { - "lovelacePerUTxOWord": 34482, - "executionPrices": { - "prSteps": - { - "numerator" : 721, - "denominator" : 10000000 - }, - "prMem": - { - "numerator" : 577, - "denominator" : 10000 - } + "collateralPercentage": 150, + "costModels": { + "PlutusV1": [ + 197209, + 0, + 1, + 1, + 396231, + 621, + 0, + 1, + 150000, + 1000, + 0, + 1, + 150000, + 32, + 2477736, + 29175, + 4, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 100, + 100, + 29773, + 100, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 1000, + 0, + 1, + 150000, + 32, + 150000, + 1000, + 0, + 8, + 148000, + 425507, + 118, + 0, + 1, + 1, + 150000, + 1000, + 0, + 8, + 150000, + 112536, + 247, + 1, + 150000, + 10000, + 1, + 136542, + 1326, + 1, + 1000, + 150000, + 1000, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 1, + 1, + 150000, + 1, + 150000, + 4, + 103599, + 248, + 1, + 103599, + 248, + 1, + 145276, + 1366, + 1, + 179690, + 497, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 148000, + 425507, + 118, + 0, + 1, + 1, + 61516, + 11218, + 0, + 1, + 150000, + 32, + 148000, + 425507, + 118, + 0, + 1, + 1, + 148000, + 425507, + 118, + 0, + 1, + 1, + 2477736, + 29175, + 4, + 0, + 82363, + 4, + 150000, + 5000, + 0, + 1, + 150000, + 32, + 197209, + 0, + 1, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 3345831, + 1, + 1 + ] }, - "maxTxExUnits": { - "exUnitsMem": 10000000, - "exUnitsSteps": 10000000000 + "executionPrices": { + "prMem": 5.77e-2, + "prSteps": 7.21e-5 }, + "lovelacePerUTxOWord": 34482, "maxBlockExUnits": { - "exUnitsMem": 50000000, + "exUnitsMem": 50000000, "exUnitsSteps": 40000000000 }, - "maxValueSize": 5000, - "collateralPercentage": 150, "maxCollateralInputs": 3, - "costModels": { - "PlutusV1": { - "sha2_256-memory-arguments": 4, - "equalsString-cpu-arguments-constant": 1000, - "cekDelayCost-exBudgetMemory": 100, - "lessThanEqualsByteString-cpu-arguments-intercept": 103599, - "divideInteger-memory-arguments-minimum": 1, - "appendByteString-cpu-arguments-slope": 621, - "blake2b-cpu-arguments-slope": 29175, - "iData-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-slope": 1000, - "unBData-cpu-arguments": 150000, - "multiplyInteger-cpu-arguments-intercept": 61516, - "cekConstCost-exBudgetMemory": 100, - "nullList-cpu-arguments": 150000, - "equalsString-cpu-arguments-intercept": 150000, - "trace-cpu-arguments": 150000, - "mkNilData-memory-arguments": 32, - "lengthOfByteString-cpu-arguments": 150000, - "cekBuiltinCost-exBudgetCPU": 29773, - "bData-cpu-arguments": 150000, - "subtractInteger-cpu-arguments-slope": 0, - "unIData-cpu-arguments": 150000, - "consByteString-memory-arguments-intercept": 0, - "divideInteger-memory-arguments-slope": 1, - "divideInteger-cpu-arguments-model-arguments-slope": 118, - "listData-cpu-arguments": 150000, - "headList-cpu-arguments": 150000, - "chooseData-memory-arguments": 32, - "equalsInteger-cpu-arguments-intercept": 136542, - "sha3_256-cpu-arguments-slope": 82363, - "sliceByteString-cpu-arguments-slope": 5000, - "unMapData-cpu-arguments": 150000, - "lessThanInteger-cpu-arguments-intercept": 179690, - "mkCons-cpu-arguments": 150000, - "appendString-memory-arguments-intercept": 0, - "modInteger-cpu-arguments-model-arguments-slope": 118, - "ifThenElse-cpu-arguments": 1, - "mkNilPairData-cpu-arguments": 150000, - "lessThanEqualsInteger-cpu-arguments-intercept": 145276, - "addInteger-memory-arguments-slope": 1, - "chooseList-memory-arguments": 32, - "constrData-memory-arguments": 32, - "decodeUtf8-cpu-arguments-intercept": 150000, - "equalsData-memory-arguments": 1, - "subtractInteger-memory-arguments-slope": 1, - "appendByteString-memory-arguments-intercept": 0, - "lengthOfByteString-memory-arguments": 4, - "headList-memory-arguments": 32, - "listData-memory-arguments": 32, - "consByteString-cpu-arguments-intercept": 150000, - "unIData-memory-arguments": 32, - "remainderInteger-memory-arguments-minimum": 1, - "bData-memory-arguments": 32, - "lessThanByteString-cpu-arguments-slope": 248, - "encodeUtf8-memory-arguments-intercept": 0, - "cekStartupCost-exBudgetCPU": 100, - "multiplyInteger-memory-arguments-intercept": 0, - "unListData-memory-arguments": 32, - "remainderInteger-cpu-arguments-model-arguments-slope": 118, - "cekVarCost-exBudgetCPU": 29773, - "remainderInteger-memory-arguments-slope": 1, - "cekForceCost-exBudgetCPU": 29773, - "sha2_256-cpu-arguments-slope": 29175, - "equalsInteger-memory-arguments": 1, - "indexByteString-memory-arguments": 1, - "addInteger-memory-arguments-intercept": 1, - "chooseUnit-cpu-arguments": 150000, - "sndPair-cpu-arguments": 150000, - "cekLamCost-exBudgetCPU": 29773, - "fstPair-cpu-arguments": 150000, - "quotientInteger-memory-arguments-minimum": 1, - "decodeUtf8-cpu-arguments-slope": 1000, - "lessThanInteger-memory-arguments": 1, - "lessThanEqualsInteger-cpu-arguments-slope": 1366, - "fstPair-memory-arguments": 32, - "modInteger-memory-arguments-intercept": 0, - "unConstrData-cpu-arguments": 150000, - "lessThanEqualsInteger-memory-arguments": 1, - "chooseUnit-memory-arguments": 32, - "sndPair-memory-arguments": 32, - "addInteger-cpu-arguments-intercept": 197209, - "decodeUtf8-memory-arguments-slope": 8, - "equalsData-cpu-arguments-intercept": 150000, - "mapData-cpu-arguments": 150000, - "mkPairData-cpu-arguments": 150000, - "quotientInteger-cpu-arguments-constant": 148000, - "consByteString-memory-arguments-slope": 1, - "cekVarCost-exBudgetMemory": 100, - "indexByteString-cpu-arguments": 150000, - "unListData-cpu-arguments": 150000, - "equalsInteger-cpu-arguments-slope": 1326, - "cekStartupCost-exBudgetMemory": 100, - "subtractInteger-cpu-arguments-intercept": 197209, - "divideInteger-cpu-arguments-model-arguments-intercept": 425507, - "divideInteger-memory-arguments-intercept": 0, - "cekForceCost-exBudgetMemory": 100, - "blake2b-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-constant": 148000, - "tailList-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-intercept": 150000, - "equalsString-cpu-arguments-slope": 1000, - "lessThanByteString-memory-arguments": 1, - "multiplyInteger-cpu-arguments-slope": 11218, - "appendByteString-cpu-arguments-intercept": 396231, - "lessThanEqualsByteString-cpu-arguments-slope": 248, - "modInteger-memory-arguments-slope": 1, - "addInteger-cpu-arguments-slope": 0, - "equalsData-cpu-arguments-slope": 10000, - "decodeUtf8-memory-arguments-intercept": 0, - "chooseList-cpu-arguments": 150000, - "constrData-cpu-arguments": 150000, - "equalsByteString-memory-arguments": 1, - "cekApplyCost-exBudgetCPU": 29773, - "quotientInteger-memory-arguments-slope": 1, - "verifySignature-cpu-arguments-intercept": 3345831, - "unMapData-memory-arguments": 32, - "mkCons-memory-arguments": 32, - "sliceByteString-memory-arguments-slope": 1, - "sha3_256-memory-arguments": 4, - "ifThenElse-memory-arguments": 1, - "mkNilPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-slope": 247, - "appendString-cpu-arguments-intercept": 150000, - "quotientInteger-cpu-arguments-model-arguments-slope": 118, - "cekApplyCost-exBudgetMemory": 100, - "equalsString-memory-arguments": 1, - "multiplyInteger-memory-arguments-slope": 1, - "cekBuiltinCost-exBudgetMemory": 100, - "remainderInteger-memory-arguments-intercept": 0, - "sha2_256-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-model-arguments-intercept": 425507, - "lessThanEqualsByteString-memory-arguments": 1, - "tailList-memory-arguments": 32, - "mkNilData-cpu-arguments": 150000, - "chooseData-cpu-arguments": 150000, - "unBData-memory-arguments": 32, - "blake2b-memory-arguments": 4, - "iData-memory-arguments": 32, - "nullList-memory-arguments": 32, - "cekDelayCost-exBudgetCPU": 29773, - "subtractInteger-memory-arguments-intercept": 1, - "lessThanByteString-cpu-arguments-intercept": 103599, - "consByteString-cpu-arguments-slope": 1000, - "appendByteString-memory-arguments-slope": 1, - "trace-memory-arguments": 32, - "divideInteger-cpu-arguments-constant": 148000, - "cekConstCost-exBudgetCPU": 29773, - "encodeUtf8-memory-arguments-slope": 8, - "quotientInteger-cpu-arguments-model-arguments-intercept": 425507, - "mapData-memory-arguments": 32, - "appendString-cpu-arguments-slope": 1000, - "modInteger-cpu-arguments-constant": 148000, - "verifySignature-cpu-arguments-slope": 1, - "unConstrData-memory-arguments": 32, - "quotientInteger-memory-arguments-intercept": 0, - "equalsByteString-cpu-arguments-constant": 150000, - "sliceByteString-memory-arguments-intercept": 0, - "mkPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-intercept": 112536, - "appendString-memory-arguments-slope": 1, - "lessThanInteger-cpu-arguments-slope": 497, - "modInteger-cpu-arguments-model-arguments-intercept": 425507, - "modInteger-memory-arguments-minimum": 1, - "sha3_256-cpu-arguments-intercept": 0, - "verifySignature-memory-arguments": 1, - "cekLamCost-exBudgetMemory": 100, - "sliceByteString-cpu-arguments-intercept": 150000 - } - } -} + "maxTxExUnits": { + "exUnitsMem": 10000000, + "exUnitsSteps": 10000000000 + }, + "maxValueSize": 5000 +} \ No newline at end of file diff --git a/cardano-lib/private/byron-genesis.json b/cardano-lib/private/byron-genesis.json index 1f20b7a6..07a6ebdf 100644 --- a/cardano-lib/private/byron-genesis.json +++ b/cardano-lib/private/byron-genesis.json @@ -1,69 +1,62 @@ -{ "bootStakeholders": - { "360de54fe087f4635b100aee89bb2cc9056c763e0d7cca2e15a4fbc6": 1 - , "d7d4f47af4ecd249fa648c643ef18b73cf4b22afdd047d43a7497bd7": 1 - , "e5124fa5d6c251a803bb70b84f6b2d09b7ec6f0b58ff2ebb2b577b5b": 1 +{ + "avvmDistr": {}, + "blockVersionData": { + "heavyDelThd": "300000000000", + "maxBlockSize": "2000000", + "maxHeaderSize": "2000000", + "maxProposalSize": "700", + "maxTxSize": "4096", + "mpcThd": "20000000000000", + "scriptVersion": 0, + "slotDuration": "20000", + "softforkRule": { + "initThd": "900000000000000", + "minThd": "600000000000000", + "thdDecrement": "50000000000000" + }, + "txFeePolicy": { + "multiplier": "43946000000", + "summand": "155381000000000" + }, + "unlockStakeEpoch": "18446744073709551615", + "updateImplicit": "10000", + "updateProposalThd": "100000000000000", + "updateVoteThd": "1000000000000" + }, + "bootStakeholders": { + "073f07abb66448e8032aff8851c5b553dc2dfa29882755306cacd3be": 1, + "53f2ed0a77615dcae37d2345bcc5569f99f5812eeaf22b6363170874": 1, + "cd38fa9c37e822ce8a06a638e87e729bfe5f3d253aa06541a21b5deb": 1 + }, + "heavyDelegation": { + "073f07abb66448e8032aff8851c5b553dc2dfa29882755306cacd3be": { + "cert": "ad1b10810de30e03e9d2efe717bce907424fcd8b055d4448c80ffbe3fcf0e72be1142de80c70b2f8a7c515243f8d57629ecb5fe97612c1f2574d6a37f1bf0803", + "delegatePk": "KdhBCxYFDjVvnLkqNGtTW804/wkjoMw/3Pin3+tOFetfC5tn2/0sGQelXHUxpgk+NPkc5rUFkbOY6aHt3DnsCw==", + "issuerPk": "aBLUpcNVKiVnzNGvzjAHPxptjvDOCrhRxUawv6xQxGoHLGGyAF4yx48fxZuCapc5RK8HAvegVFAut6U8EMeugA==", + "omega": 0 + }, + "53f2ed0a77615dcae37d2345bcc5569f99f5812eeaf22b6363170874": { + "cert": "a6644a78c5811e1409345f2e8bfefa82c7609d1a466e1d826f10a30c506066341e28820681748c19fbfafe2fd105073f2238dab944fc8835429d307865180001", + "delegatePk": "Zx6yYqxewWbMLGqmKI9rDJltpoMJLfyDfW+sjg3VpvUsRRt2qaew/mRiqccv+uXL5yJTOFwhX+U/ZV5oAdgobQ==", + "issuerPk": "arH0DguKbim3VfSIfLUapY6k0X8w8ktshJ+Tdlx4VvHtAMQPQd5A+uK+x879KGnNmgZg5X6lBCOEpcdoFZzAfg==", + "omega": 0 + }, + "cd38fa9c37e822ce8a06a638e87e729bfe5f3d253aa06541a21b5deb": { + "cert": "c7dbe147fb7b5e3a9a76a3e2e7131b94436f49f0a53562c7f8aa9b74ef0b519011c28954de1947965235c21acb19bcb0fd1080d5e5e55f1c2bc784d17b996109", + "delegatePk": "MH+7EkeOdJRdGPN2+DyrWTnofmbWLGBiKwkCg+BVYo4w5GdobrAUnR8waOpJzliMFDrc2YzR0u6gwSokbyQS9w==", + "issuerPk": "WXRVPXKp7Qy9RMGnVOMrMrMf9NWDNUt78m8TsXUQNcgAkVtQNTYpvtnqgZdZ+tzFRyhiTi8Oh2k7QC0IPniGcQ==", + "omega": 0 } -, "heavyDelegation": - { "360de54fe087f4635b100aee89bb2cc9056c763e0d7cca2e15a4fbc6": - { "omega": 0 - , "issuerPk": - "kgM871kCQufgdNd0gvBsjB3HjGC/ACQx+CuwymYoI1EXngPPbQf39fM/crwx0h0WRWN3MKPrOXT/CHu4dD+g8A==" - , "delegatePk": - "YUwskphKs+G2GUQ6nvEw8aLPyHT2sMyNrbgHXqjtHQh84Cqvp0lrEXoQMhZhuiQjxW17dYCw5E00dLE+4Z0bMQ==" - , "cert": - "050049cd59a7591b2753f3b66f236a8f40f8e8efaed3d831a45f590aae6716e31120c55054f9da4e0759fd657762426fd66b919f7b2f965edd00547edf06ee04" - } - , "d7d4f47af4ecd249fa648c643ef18b73cf4b22afdd047d43a7497bd7": - { "omega": 0 - , "issuerPk": - "4I61gLeIlsDPodufUF+MH9+p4DTxOKC1Ztl3x8UjTSuxvdDvNNlXJp/x/RsTRm20264xgeGFBIMU7+49sxjt0Q==" - , "delegatePk": - "nPtBvFVhZnBLRFaZGGtYAV5UKNjWfG6aKgiuP9UoJkkddNxALVVDTLmgf4hJfde0J31dzIuMUUYjBxFSONvJ4Q==" - , "cert": - "3661db9af505bbd6e4d19d958c95fe1ecf8d9199fbdb4a393bad46adcea984afad9e02d0028f8c1ce2d1ecd52935e6584446e02ce0fbf5062b97a7c8f75cef01" - } - , "e5124fa5d6c251a803bb70b84f6b2d09b7ec6f0b58ff2ebb2b577b5b": - { "omega": 0 - , "issuerPk": - "EggsnnKaCeyeaY8GJtOWGId10bFp1k6Ss4WuxTjOLhp2vCCx2zhT+zXXswkcrG8cao1W+4OYLiEvtyFKfCAliA==" - , "delegatePk": - "fvdKcyWHmkMgNwZ7Gjk90g5oeebby/tN+CLrvMAunVDapFlRayaPD+Zqzlh5uY9zLNpsPf8gXeyVNxcBTXRUMw==" - , "cert": - "3a9869cde53af9f243c65b4b2af34217daf5ec1a72cec7f6b7e047521ae3dce8eab954065a062f0284eda910a5ccd0cef7b35302af9fc96399748512327aec05" - } - } -, "startTime": 1679043600 -, "nonAvvmBalances": - { "FHnt4NL7yPXjUDBTpUCSCP35FUW5tMeBFBoVyWFH8KGH1R1KoBJDjhMCo9woWKc": - "0" - , "FHnt4NL7yPXsixC2y96yfWooq8E7ZaSnkkneWNCkfYNVYvsdJ6p43t6tSAbBgLy": - "30000000000000000" - , "FHnt4NL7yPXsov3wDjBWdFPX19fihzbd6pHyt9yyikYbVeTLz11mDwir3sXUEzc": - "0" - , "FHnt4NL7yPYAVwyDyGC7zNcu1Xm7hnWjwRK9TaffsYrEL1az5mEJWtr7VqJDhJS": - "0" - } -, "blockVersionData": - { "scriptVersion": 0 - , "slotDuration": "20000" - , "maxBlockSize": "2000000" - , "maxHeaderSize": "2000000" - , "maxTxSize": "4096" - , "maxProposalSize": "700" - , "mpcThd": "20000000000000" - , "heavyDelThd": "300000000000" - , "updateVoteThd": "1000000000000" - , "updateProposalThd": "100000000000000" - , "updateImplicit": "10000" - , "softforkRule": - { "initThd": "900000000000000" - , "minThd": "600000000000000" - , "thdDecrement": "50000000000000" - } - , "txFeePolicy": - { "summand": "155381000000000" , "multiplier": "43946000000" } - , "unlockStakeEpoch": "18446744073709551615" - } -, "protocolConsts": { "k": 36 , "protocolMagic": 7 } -, "avvmDistr": {} -} \ No newline at end of file + }, + "nonAvvmBalances": { + "FHnt4NL7yPXhGz8Zi1JWrZysMyFWTnjJoyU2XJAyBpeNVspmmXi2nAkEEWJnr7U": "0", + "FHnt4NL7yPXqVH37cxfDpCtiEwTYxKxE86rYyBSuacaawe27wcgzt8zPFhZkKdC": "0", + "FHnt4NL7yPXw1jz57n2a8VnQbfQgXHumSLkjeAjQtei6bQpjJ1B9F9VG6xXJMQH": "0", + "FHnt4NL7yPXxowmhCYh7Vz1aJbRCbLK6SfYUX7y1r5mCEh1kdqgAn26euF7SW3y": "30000000000000000" + }, + "protocolConsts": { + "k": 36, + "protocolMagic": 5 + }, + "startTime": 1698451200 +} diff --git a/cardano-lib/private/shelley-genesis.json b/cardano-lib/private/shelley-genesis.json index 814425e9..1bf698c8 100644 --- a/cardano-lib/private/shelley-genesis.json +++ b/cardano-lib/private/shelley-genesis.json @@ -2,24 +2,24 @@ "activeSlotsCoeff": 5.0e-2, "epochLength": 7200, "genDelegs": { - "1bf3d56713ba20fa5db0cc0794be446124a98327ae2f683be6a474ba": { - "delegate": "49594019c411e35f0a41999e784f36ed972ec9d9070fc378fa7c654a", - "vrf": "f4b57064c7a0123b311ba44ca6a1c9955223a1e9bccf00cf45f539baca7c4400" + "04794bbb457731caa5299ad48baa5a17abca5d79b1b15ba4d0877d26": { + "delegate": "71fb1cb541640cd6437e4e65955e9ac2c38e096d4bc70e08317403c3", + "vrf": "77485eaf7d10b9bbfe9ee66fc5e02a0608093bffd18eccb8967db62b95e07673" }, - "322df8d7012ba9b3183974fff1f7d85ad147bae643d43ce0618adab3": { - "delegate": "3e26176eb127f81116e3b661959a56ad8cc2ba7ae2d0ceac34306587", - "vrf": "d73756345d89389d13a617122072a76f56251e31694ebece5f1de9086b9b9342" + "68755dfcd8f1dfc0f29d76884612dc1be07046da52e650465af3e490": { + "delegate": "461317deb43187863ea9cd6c02dcb3bdd2b913f6aa27563e5c502bf8", + "vrf": "88eb203d4d7e40dc28ce0577029b327c02d566ed19889267cc719ec57df0bc98" }, - "5661b80f77db9cda873b444d9487a36b1f03c1ff4676b44df9c3e9aa": { - "delegate": "dfc7b794581b54da799f19e96072b85d6121e5506a5b5fe19a6113a2", - "vrf": "f1b4dce553282c0def53449a946b981a29421e7c988fd82d7d27288d6f04b799" + "aa4584a27e2555b46f012a236a0abda64e0a213f947d2bbacc964db1": { + "delegate": "2dae19573bed7614c49d7d895cbcec58a264ac59e332e43fa3847cd9", + "vrf": "c91228e01b04f9aede52bd7853b2b750907962a37f26cd3f705db6eccb483ff7" } }, "initialFunds": {}, "maxKESEvolutions": 62, "maxLovelaceSupply": 45000000000000000, "networkId": "Testnet", - "networkMagic": 7, + "networkMagic": 5, "protocolParams": { "a0": 0.3, "decentralisationParam": 1.0, @@ -51,6 +51,6 @@ "pools": {}, "stake": {} }, - "systemStart": "2023-03-17T09:00:00Z", + "systemStart": "2023-10-28T00:00:00Z", "updateQuorum": 3 } \ No newline at end of file From 8ac432de1bb2f271c78b0a716148396e3ec5b06d Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Wed, 1 Nov 2023 17:40:42 -0500 Subject: [PATCH 08/10] sanchonet: update ledger peers after for respin epoch +2 --- cardano-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index 48754e8a..010b84bb 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -208,7 +208,7 @@ let ]; edgePort = 3001; networkConfig = import ./sanchonet-config.nix; - usePeersFromLedgerAfterSlot = 10800600; + usePeersFromLedgerAfterSlot = 12268800; }; private = rec { From f3db7ddc94d52ce5b627da59cf690aa61fe4d55f Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Thu, 2 Nov 2023 13:26:25 -0500 Subject: [PATCH 09/10] imp: use updated conway genesis in private and shelley-qa --- cardano-lib/default.nix | 2 +- cardano-lib/private-config.nix | 2 +- cardano-lib/private/conway-genesis.json | 10 +++++----- cardano-lib/shelley_qa-config.nix | 2 +- cardano-lib/shelley_qa/conway-genesis.json | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cardano-lib/default.nix b/cardano-lib/default.nix index 010b84bb..afed4a6d 100644 --- a/cardano-lib/default.nix +++ b/cardano-lib/default.nix @@ -227,7 +227,7 @@ let ]; edgePort = 3001; networkConfig = import ./private-config.nix; - usePeersFromLedgerAfterSlot = 32000; + usePeersFromLedgerAfterSlot = 496900; }; }; diff --git a/cardano-lib/private-config.nix b/cardano-lib/private-config.nix index e90f8eb7..d6b271d9 100644 --- a/cardano-lib/private-config.nix +++ b/cardano-lib/private-config.nix @@ -13,7 +13,7 @@ AlonzoGenesisFile = ./private + "/alonzo-genesis.json"; AlonzoGenesisHash = "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec"; ConwayGenesisFile = ./private + "/conway-genesis.json"; - ConwayGenesisHash = "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6"; + ConwayGenesisHash = "89dd23dc6a020afa0c7521fe52fe14e38d494129933a3604154a3acfa4ac16e4"; ### Core protocol parameters ##### Protocol = "Cardano"; diff --git a/cardano-lib/private/conway-genesis.json b/cardano-lib/private/conway-genesis.json index 078d33b1..14d9c0f6 100644 --- a/cardano-lib/private/conway-genesis.json +++ b/cardano-lib/private/conway-genesis.json @@ -18,11 +18,11 @@ "dvtTreasuryWithdrawal": 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": "", diff --git a/cardano-lib/shelley_qa-config.nix b/cardano-lib/shelley_qa-config.nix index a07f687b..5061d6af 100644 --- a/cardano-lib/shelley_qa-config.nix +++ b/cardano-lib/shelley_qa-config.nix @@ -13,7 +13,7 @@ AlonzoGenesisFile = ./shelley_qa + "/alonzo-genesis.json"; AlonzoGenesisHash = "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec"; ConwayGenesisFile = ./shelley_qa + "/conway-genesis.json"; - ConwayGenesisHash = "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6"; + ConwayGenesisHash = "89dd23dc6a020afa0c7521fe52fe14e38d494129933a3604154a3acfa4ac16e4"; ##### Core protocol parameters ##### Protocol = "Cardano"; diff --git a/cardano-lib/shelley_qa/conway-genesis.json b/cardano-lib/shelley_qa/conway-genesis.json index 078d33b1..14d9c0f6 100644 --- a/cardano-lib/shelley_qa/conway-genesis.json +++ b/cardano-lib/shelley_qa/conway-genesis.json @@ -18,11 +18,11 @@ "dvtTreasuryWithdrawal": 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": "", From dd6693ae8ed3522dd6980681856de9e725ca906a Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Thu, 2 Nov 2023 15:25:43 -0500 Subject: [PATCH 10/10] imp: update preview/preprod conway genesis and hash for node 8.6.0-pre --- cardano-lib/preprod-config.nix | 2 +- cardano-lib/preprod/conway-genesis.json | 10 +++++----- cardano-lib/preview-config.nix | 2 +- cardano-lib/preview/conway-genesis.json | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cardano-lib/preprod-config.nix b/cardano-lib/preprod-config.nix index b3227554..654ff86d 100644 --- a/cardano-lib/preprod-config.nix +++ b/cardano-lib/preprod-config.nix @@ -13,7 +13,7 @@ AlonzoGenesisFile = ./preprod + "/alonzo-genesis.json"; AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874"; ConwayGenesisFile = ./preprod + "/conway-genesis.json"; - ConwayGenesisHash = "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6"; + ConwayGenesisHash = "89dd23dc6a020afa0c7521fe52fe14e38d494129933a3604154a3acfa4ac16e4"; ##### Core protocol parameters ##### diff --git a/cardano-lib/preprod/conway-genesis.json b/cardano-lib/preprod/conway-genesis.json index 078d33b1..14d9c0f6 100644 --- a/cardano-lib/preprod/conway-genesis.json +++ b/cardano-lib/preprod/conway-genesis.json @@ -18,11 +18,11 @@ "dvtTreasuryWithdrawal": 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": "", diff --git a/cardano-lib/preview-config.nix b/cardano-lib/preview-config.nix index bb0f07a7..f847bdfb 100644 --- a/cardano-lib/preview-config.nix +++ b/cardano-lib/preview-config.nix @@ -13,7 +13,7 @@ AlonzoGenesisFile = ./preview + "/alonzo-genesis.json"; AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874"; ConwayGenesisFile = ./preview + "/conway-genesis.json"; - ConwayGenesisHash = "f7d46bdd3b3c8caf38351c4eef3346a89241707270be0d6106e8a407db294cc6"; + ConwayGenesisHash = "89dd23dc6a020afa0c7521fe52fe14e38d494129933a3604154a3acfa4ac16e4"; ### Core protocol parameters ##### Protocol = "Cardano"; diff --git a/cardano-lib/preview/conway-genesis.json b/cardano-lib/preview/conway-genesis.json index 078d33b1..14d9c0f6 100644 --- a/cardano-lib/preview/conway-genesis.json +++ b/cardano-lib/preview/conway-genesis.json @@ -18,11 +18,11 @@ "dvtTreasuryWithdrawal": 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": "",