From eaa448f001e3afb84052250be70abae9a5186397 Mon Sep 17 00:00:00 2001 From: egieseke Date: Thu, 2 Jun 2022 13:05:18 -0400 Subject: [PATCH 1/3] Created recipe for FastNet. --- .../recipes/fastnet/Makefile | 12 + .../recipes/fastnet/gen_topology.py | 32 ++ .../recipes/fastnet/genesis.json | 104 ++++ .../recipes/fastnet/net.json | 544 ++++++++++++++++++ .../recipes/fastnet/node.json | 10 + .../recipes/fastnet/nonPartNode.json | 5 + .../recipes/fastnet/recipe.json | 7 + .../recipes/fastnet/relay.json | 11 + .../recipes/fastnet/topology.json | 100 ++++ 9 files changed, 825 insertions(+) create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/Makefile create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/genesis.json create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/net.json create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/node.json create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/nonPartNode.json create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/recipe.json create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/relay.json create mode 100644 test/testdata/deployednettemplates/recipes/fastnet/topology.json diff --git a/test/testdata/deployednettemplates/recipes/fastnet/Makefile b/test/testdata/deployednettemplates/recipes/fastnet/Makefile new file mode 100644 index 0000000000..c30931584e --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/Makefile @@ -0,0 +1,12 @@ +PARAMS=-w 12 -R 6 -N 12 -n 12 -H 6 --node-template node.json --relay-template relay.json --non-participating-node-template nonPartNode.json + +all: net.json genesis.json + +net.json: node.json relay.json nonPartNode.json ${GOPATH}/bin/netgoal Makefile + netgoal generate -t net -r /tmp/wat -o net.json ${PARAMS} + +genesis.json: node.json relay.json nonPartNode.json ${GOPATH}/bin/netgoal Makefile + netgoal generate -t genesis -r /tmp/wat -o genesis.json ${PARAMS} + +clean: + rm -f net.json genesis.json diff --git a/test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py b/test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py new file mode 100644 index 0000000000..da4a3bf00d --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py @@ -0,0 +1,32 @@ +node_types = {"R":6, "N":12, "NPN":6} +node_size = {"R":"-m5d.4xl", "N":"-m5d.4xl", "NPN":"-m5d.4xl"} +regions = [ + "AWS-US-EAST-2", + "AWS-US-WEST-2", + "AWS-EU-CENTRAL-1", + "AWS-EU-WEST-2", + "AWS-AP-SOUTHEAST-1", + "AWS-AP-SOUTHEAST-2" +] + +f = open("topology.json", "w") +f.write("{ \"Hosts\":\n [") + +region_count = len(regions) +first = True +for x in node_types: + node_type = x + node_count = node_types[x] + region_size = node_size[x] + for i in range(node_count): + node_name = node_type + str(i+1) + region = regions[i%region_count] + if (first ): + first = False + else: + f.write(",") + f.write ("\n {\n \"Name\": \"" + node_name + "\",\n \"Template\": \"" + region + region_size + "\"\n }" ) + +f.write("\n ]\n}\n") +f.close() + diff --git a/test/testdata/deployednettemplates/recipes/fastnet/genesis.json b/test/testdata/deployednettemplates/recipes/fastnet/genesis.json new file mode 100644 index 0000000000..5e2423e303 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/genesis.json @@ -0,0 +1,104 @@ +{ + "NetworkName": "", + "VersionModifier": "", + "ConsensusProtocol": "future", + "FirstPartKeyRound": 0, + "LastPartKeyRound": 30000, + "PartKeyDilution": 0, + "Wallets": [ + { + "Name": "Wallet1", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet2", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet3", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet4", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet5", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet6", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet7", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet8", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet9", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet10", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet11", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet12", + "Stake": 4.166666666666667, + "Online": true + }, + { + "Name": "Wallet13", + "Stake": 8.333333333333334, + "Online": false + }, + { + "Name": "Wallet14", + "Stake": 8.333333333333334, + "Online": false + }, + { + "Name": "Wallet15", + "Stake": 8.333333333333334, + "Online": false + }, + { + "Name": "Wallet16", + "Stake": 8.333333333333334, + "Online": false + }, + { + "Name": "Wallet17", + "Stake": 8.333333333333334, + "Online": false + }, + { + "Name": "Wallet18", + "Stake": 8.333333333333334, + "Online": false + } + ], + "FeeSink": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ", + "RewardsPool": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ", + "DevMode": false, + "Comment": "" +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/net.json b/test/testdata/deployednettemplates/recipes/fastnet/net.json new file mode 100644 index 0000000000..c8da93fa0f --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/net.json @@ -0,0 +1,544 @@ +{ + "Hosts": [ + { + "Name": "R1", + "Group": "", + "Nodes": [ + { + "Name": "relay1", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "R2", + "Group": "", + "Nodes": [ + { + "Name": "relay2", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "R3", + "Group": "", + "Nodes": [ + { + "Name": "relay3", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "R4", + "Group": "", + "Nodes": [ + { + "Name": "relay4", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "R5", + "Group": "", + "Nodes": [ + { + "Name": "relay5", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "R6", + "Group": "", + "Nodes": [ + { + "Name": "relay6", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N1", + "Group": "", + "Nodes": [ + { + "Name": "node1", + "Wallets": [ + { + "Name": "Wallet1", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N2", + "Group": "", + "Nodes": [ + { + "Name": "node2", + "Wallets": [ + { + "Name": "Wallet2", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N3", + "Group": "", + "Nodes": [ + { + "Name": "node3", + "Wallets": [ + { + "Name": "Wallet3", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N4", + "Group": "", + "Nodes": [ + { + "Name": "node4", + "Wallets": [ + { + "Name": "Wallet4", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N5", + "Group": "", + "Nodes": [ + { + "Name": "node5", + "Wallets": [ + { + "Name": "Wallet5", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N6", + "Group": "", + "Nodes": [ + { + "Name": "node6", + "Wallets": [ + { + "Name": "Wallet6", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N7", + "Group": "", + "Nodes": [ + { + "Name": "node7", + "Wallets": [ + { + "Name": "Wallet7", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N8", + "Group": "", + "Nodes": [ + { + "Name": "node8", + "Wallets": [ + { + "Name": "Wallet8", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N9", + "Group": "", + "Nodes": [ + { + "Name": "node9", + "Wallets": [ + { + "Name": "Wallet9", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N10", + "Group": "", + "Nodes": [ + { + "Name": "node10", + "Wallets": [ + { + "Name": "Wallet10", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N11", + "Group": "", + "Nodes": [ + { + "Name": "node11", + "Wallets": [ + { + "Name": "Wallet11", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N12", + "Group": "", + "Nodes": [ + { + "Name": "node12", + "Wallets": [ + { + "Name": "Wallet12", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "NPN1", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode1", + "Wallets": [ + { + "Name": "Wallet13", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + }, + { + "Name": "NPN2", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode2", + "Wallets": [ + { + "Name": "Wallet14", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + }, + { + "Name": "NPN3", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode3", + "Wallets": [ + { + "Name": "Wallet15", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + }, + { + "Name": "NPN4", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode4", + "Wallets": [ + { + "Name": "Wallet16", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + }, + { + "Name": "NPN5", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode5", + "Wallets": [ + { + "Name": "Wallet17", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + }, + { + "Name": "NPN6", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode6", + "Wallets": [ + { + "Name": "Wallet18", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + } + ] +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/node.json b/test/testdata/deployednettemplates/recipes/fastnet/node.json new file mode 100644 index 0000000000..7b505bb212 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/node.json @@ -0,0 +1,10 @@ +{ + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableBlockStats": true, + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/nonPartNode.json b/test/testdata/deployednettemplates/recipes/fastnet/nonPartNode.json new file mode 100644 index 0000000000..5b0a52d9d9 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/nonPartNode.json @@ -0,0 +1,5 @@ +{ + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/recipe.json b/test/testdata/deployednettemplates/recipes/fastnet/recipe.json new file mode 100644 index 0000000000..a2f88f63b4 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/recipe.json @@ -0,0 +1,7 @@ +{ + "GenesisFile":"genesis.json", + "NetworkFile":"net.json", + "ConfigFile": "../../configs/reference.json", + "HostTemplatesFile": "../../hosttemplates/hosttemplates.json", + "TopologyFile": "topology.json" +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/relay.json b/test/testdata/deployednettemplates/recipes/fastnet/relay.json new file mode 100644 index 0000000000..db8fb939d8 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/relay.json @@ -0,0 +1,11 @@ +{ + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableBlockStats": true, + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/topology.json b/test/testdata/deployednettemplates/recipes/fastnet/topology.json new file mode 100644 index 0000000000..77654ff100 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/fastnet/topology.json @@ -0,0 +1,100 @@ +{ "Hosts": + [ + { + "Name": "R1", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "R2", + "Template": "AWS-US-WEST-2-m5d.4xl" + }, + { + "Name": "R3", + "Template": "AWS-EU-CENTRAL-1-m5d.4xl" + }, + { + "Name": "R4", + "Template": "AWS-EU-WEST-2-m5d.4xl" + }, + { + "Name": "R5", + "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" + }, + { + "Name": "R6", + "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" + }, + { + "Name": "N1", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "N2", + "Template": "AWS-US-WEST-2-m5d.4xl" + }, + { + "Name": "N3", + "Template": "AWS-EU-CENTRAL-1-m5d.4xl" + }, + { + "Name": "N4", + "Template": "AWS-EU-WEST-2-m5d.4xl" + }, + { + "Name": "N5", + "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" + }, + { + "Name": "N6", + "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" + }, + { + "Name": "N7", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "N8", + "Template": "AWS-US-WEST-2-m5d.4xl" + }, + { + "Name": "N9", + "Template": "AWS-EU-CENTRAL-1-m5d.4xl" + }, + { + "Name": "N10", + "Template": "AWS-EU-WEST-2-m5d.4xl" + }, + { + "Name": "N11", + "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" + }, + { + "Name": "N12", + "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" + }, + { + "Name": "NPN1", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "NPN2", + "Template": "AWS-US-WEST-2-m5d.4xl" + }, + { + "Name": "NPN3", + "Template": "AWS-EU-CENTRAL-1-m5d.4xl" + }, + { + "Name": "NPN4", + "Template": "AWS-EU-WEST-2-m5d.4xl" + }, + { + "Name": "NPN5", + "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" + }, + { + "Name": "NPN6", + "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" + } + ] +} From 7f0a2092670bbcc9af5e1cd37e72fa894d808472 Mon Sep 17 00:00:00 2001 From: egieseke Date: Mon, 6 Jun 2022 09:29:51 -0400 Subject: [PATCH 2/3] Updated alphanet recipe based on PR comments. --- .../recipes/{fastnet => alphanet}/Makefile | 9 +- .../recipes/alphanet/gen_topology.py | 32 ++ .../recipes/alphanet/genesis.json | 64 +++ .../recipes/alphanet/net.json | 232 ++++++++ .../recipes/{fastnet => alphanet}/node.json | 2 +- .../{fastnet => alphanet}/nonPartNode.json | 0 .../recipes/{fastnet => alphanet}/recipe.json | 0 .../recipes/{fastnet => alphanet}/relay.json | 0 .../recipes/alphanet/topology.json | 32 ++ .../recipes/fastnet/gen_topology.py | 32 -- .../recipes/fastnet/genesis.json | 104 ---- .../recipes/fastnet/net.json | 544 ------------------ .../recipes/fastnet/topology.json | 100 ---- 13 files changed, 367 insertions(+), 784 deletions(-) rename test/testdata/deployednettemplates/recipes/{fastnet => alphanet}/Makefile (51%) create mode 100644 test/testdata/deployednettemplates/recipes/alphanet/gen_topology.py create mode 100644 test/testdata/deployednettemplates/recipes/alphanet/genesis.json create mode 100644 test/testdata/deployednettemplates/recipes/alphanet/net.json rename test/testdata/deployednettemplates/recipes/{fastnet => alphanet}/node.json (87%) rename test/testdata/deployednettemplates/recipes/{fastnet => alphanet}/nonPartNode.json (100%) rename test/testdata/deployednettemplates/recipes/{fastnet => alphanet}/recipe.json (100%) rename test/testdata/deployednettemplates/recipes/{fastnet => alphanet}/relay.json (100%) create mode 100644 test/testdata/deployednettemplates/recipes/alphanet/topology.json delete mode 100644 test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py delete mode 100644 test/testdata/deployednettemplates/recipes/fastnet/genesis.json delete mode 100644 test/testdata/deployednettemplates/recipes/fastnet/net.json delete mode 100644 test/testdata/deployednettemplates/recipes/fastnet/topology.json diff --git a/test/testdata/deployednettemplates/recipes/fastnet/Makefile b/test/testdata/deployednettemplates/recipes/alphanet/Makefile similarity index 51% rename from test/testdata/deployednettemplates/recipes/fastnet/Makefile rename to test/testdata/deployednettemplates/recipes/alphanet/Makefile index c30931584e..13130934de 100644 --- a/test/testdata/deployednettemplates/recipes/fastnet/Makefile +++ b/test/testdata/deployednettemplates/recipes/alphanet/Makefile @@ -1,6 +1,9 @@ -PARAMS=-w 12 -R 6 -N 12 -n 12 -H 6 --node-template node.json --relay-template relay.json --non-participating-node-template nonPartNode.json +PARAMS=-w 8 -R 1 -N 4 -n 8 -H 2 --node-template node.json --relay-template relay.json --non-participating-node-template nonPartNode.json -all: net.json genesis.json +all: topology.json net.json genesis.json + +topology.json: gen_topology.py + python gen_topology.py net.json: node.json relay.json nonPartNode.json ${GOPATH}/bin/netgoal Makefile netgoal generate -t net -r /tmp/wat -o net.json ${PARAMS} @@ -9,4 +12,4 @@ genesis.json: node.json relay.json nonPartNode.json ${GOPATH}/bin/netgoal Makefi netgoal generate -t genesis -r /tmp/wat -o genesis.json ${PARAMS} clean: - rm -f net.json genesis.json + rm -f net.json genesis.json topology.json diff --git a/test/testdata/deployednettemplates/recipes/alphanet/gen_topology.py b/test/testdata/deployednettemplates/recipes/alphanet/gen_topology.py new file mode 100644 index 0000000000..7298256d8a --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/alphanet/gen_topology.py @@ -0,0 +1,32 @@ +import json +import os + +node_types = {"R":1, "N":4, "NPN":2} +node_size = {"R":"-m5d.4xl", "N":"-m5d.4xl", "NPN":"-m5d.4xl"} +regions = [ + "AWS-US-EAST-2", + "AWS-US-WEST-2", + "AWS-EU-CENTRAL-1", + "AWS-EU-WEST-2", + "AWS-AP-SOUTHEAST-1", + "AWS-AP-SOUTHEAST-2" +] + +network = "alphanet" + +host_elements = [] +region_count = len(regions) +for node_type in node_types.keys(): + node_count = node_types[node_type] + region_size = node_size[node_type] + for i in range(node_count): + host = {} + node_name = node_type + str(i + 1) + "-" + network + region = regions[i % region_count] + host["Name"] = node_name + host["Template"] = region + region_size + host_elements.append(host) + +ec2_hosts = {"Hosts": host_elements} +with open("topology.json", "w") as f: + f.write(json.dumps(ec2_hosts, indent = 2) + os.linesep) diff --git a/test/testdata/deployednettemplates/recipes/alphanet/genesis.json b/test/testdata/deployednettemplates/recipes/alphanet/genesis.json new file mode 100644 index 0000000000..9b1c99fda5 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/alphanet/genesis.json @@ -0,0 +1,64 @@ +{ + "NetworkName": "alphanet", + "VersionModifier": "", + "ConsensusProtocol": "future", + "FirstPartKeyRound": 0, + "LastPartKeyRound": 3000000, + "PartKeyDilution": 0, + "Wallets": [ + { + "Name": "Wallet1", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet2", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet3", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet4", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet5", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet6", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet7", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet8", + "Stake": 6.25, + "Online": true + }, + { + "Name": "Wallet9", + "Stake": 25, + "Online": false + }, + { + "Name": "Wallet10", + "Stake": 25, + "Online": false + } + ], + "FeeSink": "OOZZ32IHB6SS6ZTARKJ2PQP3QKE7R3IWQTOPXRGLTAGPVCDS3FHJOEOYVM", + "RewardsPool": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ", + "DevMode": false, + "Comment": "" +} diff --git a/test/testdata/deployednettemplates/recipes/alphanet/net.json b/test/testdata/deployednettemplates/recipes/alphanet/net.json new file mode 100644 index 0000000000..e75a91d293 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/alphanet/net.json @@ -0,0 +1,232 @@ +{ + "Hosts": [ + { + "Name": "R1-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "relay1", + "Wallets": null, + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" + } + ] + }, + { + "Name": "N1-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "node1", + "Wallets": [ + { + "Name": "Wallet1", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + }, + { + "Name": "node5", + "Wallets": [ + { + "Name": "Wallet2", + "ParticipationOnly": false + } + ], + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + } + ] + }, + { + "Name": "N2-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "node2", + "Wallets": [ + { + "Name": "Wallet3", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + }, + { + "Name": "node6", + "Wallets": [ + { + "Name": "Wallet4", + "ParticipationOnly": false + } + ], + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + } + ] + }, + { + "Name": "N3-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "node3", + "Wallets": [ + { + "Name": "Wallet5", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + }, + { + "Name": "node7", + "Wallets": [ + { + "Name": "Wallet6", + "ParticipationOnly": false + } + ], + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + } + ] + }, + { + "Name": "N4-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "node4", + "Wallets": [ + { + "Name": "Wallet7", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + }, + { + "Name": "node8", + "Wallets": [ + { + "Name": "Wallet8", + "ParticipationOnly": false + } + ], + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" + } + ] + }, + { + "Name": "NPN1-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode1", + "Wallets": [ + { + "Name": "Wallet9", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + }, + { + "Name": "NPN2-alphanet", + "Group": "", + "Nodes": [ + { + "Name": "nonParticipatingNode2", + "Wallets": [ + { + "Name": "Wallet10", + "ParticipationOnly": false + } + ], + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": false, + "EnableMetrics": false, + "EnableService": false, + "EnableBlockStats": false, + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" + } + ] + } + ] +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/node.json b/test/testdata/deployednettemplates/recipes/alphanet/node.json similarity index 87% rename from test/testdata/deployednettemplates/recipes/fastnet/node.json rename to test/testdata/deployednettemplates/recipes/alphanet/node.json index 7b505bb212..d3b429ee32 100644 --- a/test/testdata/deployednettemplates/recipes/fastnet/node.json +++ b/test/testdata/deployednettemplates/recipes/alphanet/node.json @@ -6,5 +6,5 @@ "TelemetryURI": "{{TelemetryURI}}", "EnableMetrics": true, "MetricsURI": "{{MetricsURI}}", - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" + "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true, \"EnableRuntimeMetrics\": true}" } diff --git a/test/testdata/deployednettemplates/recipes/fastnet/nonPartNode.json b/test/testdata/deployednettemplates/recipes/alphanet/nonPartNode.json similarity index 100% rename from test/testdata/deployednettemplates/recipes/fastnet/nonPartNode.json rename to test/testdata/deployednettemplates/recipes/alphanet/nonPartNode.json diff --git a/test/testdata/deployednettemplates/recipes/fastnet/recipe.json b/test/testdata/deployednettemplates/recipes/alphanet/recipe.json similarity index 100% rename from test/testdata/deployednettemplates/recipes/fastnet/recipe.json rename to test/testdata/deployednettemplates/recipes/alphanet/recipe.json diff --git a/test/testdata/deployednettemplates/recipes/fastnet/relay.json b/test/testdata/deployednettemplates/recipes/alphanet/relay.json similarity index 100% rename from test/testdata/deployednettemplates/recipes/fastnet/relay.json rename to test/testdata/deployednettemplates/recipes/alphanet/relay.json diff --git a/test/testdata/deployednettemplates/recipes/alphanet/topology.json b/test/testdata/deployednettemplates/recipes/alphanet/topology.json new file mode 100644 index 0000000000..8760eae203 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/alphanet/topology.json @@ -0,0 +1,32 @@ +{ + "Hosts": [ + { + "Name": "R1-alphanet", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "N1-alphanet", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "N2-alphanet", + "Template": "AWS-US-WEST-2-m5d.4xl" + }, + { + "Name": "N3-alphanet", + "Template": "AWS-EU-CENTRAL-1-m5d.4xl" + }, + { + "Name": "N4-alphanet", + "Template": "AWS-EU-WEST-2-m5d.4xl" + }, + { + "Name": "NPN1-alphanet", + "Template": "AWS-US-EAST-2-m5d.4xl" + }, + { + "Name": "NPN2-alphanet", + "Template": "AWS-US-WEST-2-m5d.4xl" + } + ] +} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py b/test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py deleted file mode 100644 index da4a3bf00d..0000000000 --- a/test/testdata/deployednettemplates/recipes/fastnet/gen_topology.py +++ /dev/null @@ -1,32 +0,0 @@ -node_types = {"R":6, "N":12, "NPN":6} -node_size = {"R":"-m5d.4xl", "N":"-m5d.4xl", "NPN":"-m5d.4xl"} -regions = [ - "AWS-US-EAST-2", - "AWS-US-WEST-2", - "AWS-EU-CENTRAL-1", - "AWS-EU-WEST-2", - "AWS-AP-SOUTHEAST-1", - "AWS-AP-SOUTHEAST-2" -] - -f = open("topology.json", "w") -f.write("{ \"Hosts\":\n [") - -region_count = len(regions) -first = True -for x in node_types: - node_type = x - node_count = node_types[x] - region_size = node_size[x] - for i in range(node_count): - node_name = node_type + str(i+1) - region = regions[i%region_count] - if (first ): - first = False - else: - f.write(",") - f.write ("\n {\n \"Name\": \"" + node_name + "\",\n \"Template\": \"" + region + region_size + "\"\n }" ) - -f.write("\n ]\n}\n") -f.close() - diff --git a/test/testdata/deployednettemplates/recipes/fastnet/genesis.json b/test/testdata/deployednettemplates/recipes/fastnet/genesis.json deleted file mode 100644 index 5e2423e303..0000000000 --- a/test/testdata/deployednettemplates/recipes/fastnet/genesis.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "NetworkName": "", - "VersionModifier": "", - "ConsensusProtocol": "future", - "FirstPartKeyRound": 0, - "LastPartKeyRound": 30000, - "PartKeyDilution": 0, - "Wallets": [ - { - "Name": "Wallet1", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet2", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet3", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet4", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet5", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet6", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet7", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet8", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet9", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet10", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet11", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet12", - "Stake": 4.166666666666667, - "Online": true - }, - { - "Name": "Wallet13", - "Stake": 8.333333333333334, - "Online": false - }, - { - "Name": "Wallet14", - "Stake": 8.333333333333334, - "Online": false - }, - { - "Name": "Wallet15", - "Stake": 8.333333333333334, - "Online": false - }, - { - "Name": "Wallet16", - "Stake": 8.333333333333334, - "Online": false - }, - { - "Name": "Wallet17", - "Stake": 8.333333333333334, - "Online": false - }, - { - "Name": "Wallet18", - "Stake": 8.333333333333334, - "Online": false - } - ], - "FeeSink": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ", - "RewardsPool": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ", - "DevMode": false, - "Comment": "" -} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/net.json b/test/testdata/deployednettemplates/recipes/fastnet/net.json deleted file mode 100644 index c8da93fa0f..0000000000 --- a/test/testdata/deployednettemplates/recipes/fastnet/net.json +++ /dev/null @@ -1,544 +0,0 @@ -{ - "Hosts": [ - { - "Name": "R1", - "Group": "", - "Nodes": [ - { - "Name": "relay1", - "Wallets": null, - "NetAddress": "{{NetworkPort}}", - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "R2", - "Group": "", - "Nodes": [ - { - "Name": "relay2", - "Wallets": null, - "NetAddress": "{{NetworkPort}}", - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "R3", - "Group": "", - "Nodes": [ - { - "Name": "relay3", - "Wallets": null, - "NetAddress": "{{NetworkPort}}", - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "R4", - "Group": "", - "Nodes": [ - { - "Name": "relay4", - "Wallets": null, - "NetAddress": "{{NetworkPort}}", - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "R5", - "Group": "", - "Nodes": [ - { - "Name": "relay5", - "Wallets": null, - "NetAddress": "{{NetworkPort}}", - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "R6", - "Group": "", - "Nodes": [ - { - "Name": "relay6", - "Wallets": null, - "NetAddress": "{{NetworkPort}}", - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"EnableIncomingMessageFilter\": true, \"CadaverSizeTarget\": 0, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N1", - "Group": "", - "Nodes": [ - { - "Name": "node1", - "Wallets": [ - { - "Name": "Wallet1", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N2", - "Group": "", - "Nodes": [ - { - "Name": "node2", - "Wallets": [ - { - "Name": "Wallet2", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N3", - "Group": "", - "Nodes": [ - { - "Name": "node3", - "Wallets": [ - { - "Name": "Wallet3", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N4", - "Group": "", - "Nodes": [ - { - "Name": "node4", - "Wallets": [ - { - "Name": "Wallet4", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N5", - "Group": "", - "Nodes": [ - { - "Name": "node5", - "Wallets": [ - { - "Name": "Wallet5", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N6", - "Group": "", - "Nodes": [ - { - "Name": "node6", - "Wallets": [ - { - "Name": "Wallet6", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N7", - "Group": "", - "Nodes": [ - { - "Name": "node7", - "Wallets": [ - { - "Name": "Wallet7", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N8", - "Group": "", - "Nodes": [ - { - "Name": "node8", - "Wallets": [ - { - "Name": "Wallet8", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N9", - "Group": "", - "Nodes": [ - { - "Name": "node9", - "Wallets": [ - { - "Name": "Wallet9", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N10", - "Group": "", - "Nodes": [ - { - "Name": "node10", - "Wallets": [ - { - "Name": "Wallet10", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N11", - "Group": "", - "Nodes": [ - { - "Name": "node11", - "Wallets": [ - { - "Name": "Wallet11", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "N12", - "Group": "", - "Nodes": [ - { - "Name": "node12", - "Wallets": [ - { - "Name": "Wallet12", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", - "EnableMetrics": true, - "MetricsURI": "{{MetricsURI}}", - "EnableService": false, - "EnableBlockStats": true, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0, \"EnableAccountUpdatesStats\": true}" - } - ] - }, - { - "Name": "NPN1", - "Group": "", - "Nodes": [ - { - "Name": "nonParticipatingNode1", - "Wallets": [ - { - "Name": "Wallet13", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": false, - "EnableMetrics": false, - "EnableService": false, - "EnableBlockStats": false, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" - } - ] - }, - { - "Name": "NPN2", - "Group": "", - "Nodes": [ - { - "Name": "nonParticipatingNode2", - "Wallets": [ - { - "Name": "Wallet14", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": false, - "EnableMetrics": false, - "EnableService": false, - "EnableBlockStats": false, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" - } - ] - }, - { - "Name": "NPN3", - "Group": "", - "Nodes": [ - { - "Name": "nonParticipatingNode3", - "Wallets": [ - { - "Name": "Wallet15", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": false, - "EnableMetrics": false, - "EnableService": false, - "EnableBlockStats": false, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" - } - ] - }, - { - "Name": "NPN4", - "Group": "", - "Nodes": [ - { - "Name": "nonParticipatingNode4", - "Wallets": [ - { - "Name": "Wallet16", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": false, - "EnableMetrics": false, - "EnableService": false, - "EnableBlockStats": false, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" - } - ] - }, - { - "Name": "NPN5", - "Group": "", - "Nodes": [ - { - "Name": "nonParticipatingNode5", - "Wallets": [ - { - "Name": "Wallet17", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": false, - "EnableMetrics": false, - "EnableService": false, - "EnableBlockStats": false, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" - } - ] - }, - { - "Name": "NPN6", - "Group": "", - "Nodes": [ - { - "Name": "nonParticipatingNode6", - "Wallets": [ - { - "Name": "Wallet18", - "ParticipationOnly": false - } - ], - "APIEndpoint": "{{APIEndpoint}}", - "APIToken": "{{APIToken}}", - "EnableTelemetry": false, - "EnableMetrics": false, - "EnableService": false, - "EnableBlockStats": false, - "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0 }" - } - ] - } - ] -} diff --git a/test/testdata/deployednettemplates/recipes/fastnet/topology.json b/test/testdata/deployednettemplates/recipes/fastnet/topology.json deleted file mode 100644 index 77654ff100..0000000000 --- a/test/testdata/deployednettemplates/recipes/fastnet/topology.json +++ /dev/null @@ -1,100 +0,0 @@ -{ "Hosts": - [ - { - "Name": "R1", - "Template": "AWS-US-EAST-2-m5d.4xl" - }, - { - "Name": "R2", - "Template": "AWS-US-WEST-2-m5d.4xl" - }, - { - "Name": "R3", - "Template": "AWS-EU-CENTRAL-1-m5d.4xl" - }, - { - "Name": "R4", - "Template": "AWS-EU-WEST-2-m5d.4xl" - }, - { - "Name": "R5", - "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" - }, - { - "Name": "R6", - "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" - }, - { - "Name": "N1", - "Template": "AWS-US-EAST-2-m5d.4xl" - }, - { - "Name": "N2", - "Template": "AWS-US-WEST-2-m5d.4xl" - }, - { - "Name": "N3", - "Template": "AWS-EU-CENTRAL-1-m5d.4xl" - }, - { - "Name": "N4", - "Template": "AWS-EU-WEST-2-m5d.4xl" - }, - { - "Name": "N5", - "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" - }, - { - "Name": "N6", - "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" - }, - { - "Name": "N7", - "Template": "AWS-US-EAST-2-m5d.4xl" - }, - { - "Name": "N8", - "Template": "AWS-US-WEST-2-m5d.4xl" - }, - { - "Name": "N9", - "Template": "AWS-EU-CENTRAL-1-m5d.4xl" - }, - { - "Name": "N10", - "Template": "AWS-EU-WEST-2-m5d.4xl" - }, - { - "Name": "N11", - "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" - }, - { - "Name": "N12", - "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" - }, - { - "Name": "NPN1", - "Template": "AWS-US-EAST-2-m5d.4xl" - }, - { - "Name": "NPN2", - "Template": "AWS-US-WEST-2-m5d.4xl" - }, - { - "Name": "NPN3", - "Template": "AWS-EU-CENTRAL-1-m5d.4xl" - }, - { - "Name": "NPN4", - "Template": "AWS-EU-WEST-2-m5d.4xl" - }, - { - "Name": "NPN5", - "Template": "AWS-AP-SOUTHEAST-1-m5d.4xl" - }, - { - "Name": "NPN6", - "Template": "AWS-AP-SOUTHEAST-2-m5d.4xl" - } - ] -} From b5b0151ef375adec3294a49d1969499f534f28fd Mon Sep 17 00:00:00 2001 From: egieseke Date: Mon, 6 Jun 2022 09:44:38 -0400 Subject: [PATCH 3/3] Update consensus protocol to "alpha1". --- .../testdata/deployednettemplates/recipes/alphanet/genesis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testdata/deployednettemplates/recipes/alphanet/genesis.json b/test/testdata/deployednettemplates/recipes/alphanet/genesis.json index 9b1c99fda5..1d78dd7821 100644 --- a/test/testdata/deployednettemplates/recipes/alphanet/genesis.json +++ b/test/testdata/deployednettemplates/recipes/alphanet/genesis.json @@ -1,7 +1,7 @@ { "NetworkName": "alphanet", "VersionModifier": "", - "ConsensusProtocol": "future", + "ConsensusProtocol": "alpha1", "FirstPartKeyRound": 0, "LastPartKeyRound": 3000000, "PartKeyDilution": 0,