From 2ded7d9236d582f2ed6d8d1d79bccf188b6db949 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Tue, 18 Jan 2022 16:02:05 -0500 Subject: [PATCH 1/4] Adding new recipe for feature networks --- .../recipes/feature-networks/genesis.json | 29 ++++++++++ .../feature-networks/hosttemplates.json | 10 ++++ .../recipes/feature-networks/net.json | 54 +++++++++++++++++++ .../recipes/feature-networks/recipe.json | 7 +++ .../recipes/feature-networks/topology.json | 12 +++++ 5 files changed, 112 insertions(+) create mode 100644 test/testdata/deployednettemplates/recipes/feature-networks/genesis.json create mode 100644 test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json create mode 100644 test/testdata/deployednettemplates/recipes/feature-networks/net.json create mode 100644 test/testdata/deployednettemplates/recipes/feature-networks/recipe.json create mode 100644 test/testdata/deployednettemplates/recipes/feature-networks/topology.json diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json b/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json new file mode 100644 index 0000000000..ab43dab49b --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json @@ -0,0 +1,29 @@ +{ + "NetworkName": "", + "VersionModifier": "", + "ConsensusProtocol": "future", + "FirstPartKeyRound": 0, + "LastPartKeyRound": 100000000, + "Wallets": [ + { + "Name": "Wallet1", + "Stake": 45, + "Online": true + }, + { + "Name": "Wallet2", + "Stake": 45, + "Online": true + }, + { + "Name": "Wallet3", + "Stake": 5, + "Online": true + }, + { + "Name": "Wallet4", + "Stake": 5, + "Online": true + } + ] +} diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json b/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json new file mode 100644 index 0000000000..77a4e873e3 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json @@ -0,0 +1,10 @@ +{ + "Hosts": [ + { + "Name": "AWS-US-EAST-1-Large", + "Provider": "AWS", + "Region": "us-east-1", + "BaseConfiguration": "m6i.large" + } + ] +} diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/net.json b/test/testdata/deployednettemplates/recipes/feature-networks/net.json new file mode 100644 index 0000000000..7d03c46692 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/feature-networks/net.json @@ -0,0 +1,54 @@ +{ + "Hosts": [ + { + "Name": "R1", + "Nodes": [ + { + "Name": "relay1", + "IsRelay": true, + "Wallets": [ + { + "Name": "Wallet1", + "ParticipationOnly": false + } + ], + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"DNSBootstrapID\": \".algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true }" + } + ] + }, + { + "Name": "R2", + "Nodes": [ + { + "Name": "relay2", + "IsRelay": true, + "Wallets": [ + { + "Name": "Wallet2", + "ParticipationOnly": false + } + ], + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"DNSBootstrapID\": \".algodev.network\",\"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true }" + } + ] + } + ] +} diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/recipe.json b/test/testdata/deployednettemplates/recipes/feature-networks/recipe.json new file mode 100644 index 0000000000..587e513f26 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/feature-networks/recipe.json @@ -0,0 +1,7 @@ +{ + "GenesisFile":"genesis.json", + "NetworkFile":"net.json", + "ConfigFile": "../../configs/reference.json", + "HostTemplatesFile": "hosttemplates.json", + "TopologyFile": "topology.json" +} diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/topology.json b/test/testdata/deployednettemplates/recipes/feature-networks/topology.json new file mode 100644 index 0000000000..c471d80b69 --- /dev/null +++ b/test/testdata/deployednettemplates/recipes/feature-networks/topology.json @@ -0,0 +1,12 @@ +{ + "Hosts": [ + { + "Name": "R1", + "Template": "AWS-US-EAST-1-Large" + }, + { + "Name": "R2", + "Template": "AWS-US-EAST-1-Large" + } + ] +} From ac2f588a3b0ecdcb31e58d4f9458d835f26492d9 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Wed, 19 Jan 2022 14:41:03 -0500 Subject: [PATCH 2/4] Changing to us-east-2 and wallet distribution --- .../recipes/feature-networks/genesis.json | 12 ++++++------ .../recipes/feature-networks/hosttemplates.json | 4 ++-- .../recipes/feature-networks/topology.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json b/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json index ab43dab49b..36f281f039 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json @@ -7,23 +7,23 @@ "Wallets": [ { "Name": "Wallet1", - "Stake": 45, + "Stake": 25, "Online": true }, { "Name": "Wallet2", - "Stake": 45, + "Stake": 25, "Online": true }, { "Name": "Wallet3", - "Stake": 5, - "Online": true + "Stake": 25, + "Online": false }, { "Name": "Wallet4", - "Stake": 5, - "Online": true + "Stake": 25, + "Online": false } ] } diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json b/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json index 77a4e873e3..c8c8642a24 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/hosttemplates.json @@ -1,9 +1,9 @@ { "Hosts": [ { - "Name": "AWS-US-EAST-1-Large", + "Name": "AWS-US-EAST-2-Large", "Provider": "AWS", - "Region": "us-east-1", + "Region": "us-east-2", "BaseConfiguration": "m6i.large" } ] diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/topology.json b/test/testdata/deployednettemplates/recipes/feature-networks/topology.json index c471d80b69..8633245a46 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/topology.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/topology.json @@ -2,11 +2,11 @@ "Hosts": [ { "Name": "R1", - "Template": "AWS-US-EAST-1-Large" + "Template": "AWS-US-EAST-2-Large" }, { "Name": "R2", - "Template": "AWS-US-EAST-1-Large" + "Template": "AWS-US-EAST-2-Large" } ] } From 37658214bf7221c2c95482463142cd9476dee4a7 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Wed, 19 Jan 2022 15:07:04 -0500 Subject: [PATCH 3/4] Added npn --- .../recipes/feature-networks/genesis.json | 12 +++---- .../recipes/feature-networks/net.json | 33 +++++++++++++++++-- .../recipes/feature-networks/topology.json | 4 +++ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json b/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json index 36f281f039..943e9f5150 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/genesis.json @@ -6,23 +6,23 @@ "LastPartKeyRound": 100000000, "Wallets": [ { - "Name": "Wallet1", + "Name": "Wallet1-R1", "Stake": 25, "Online": true }, { - "Name": "Wallet2", + "Name": "Wallet2-R2", "Stake": 25, "Online": true }, { - "Name": "Wallet3", - "Stake": 25, + "Name": "Wallet3-Dispenser", + "Stake": 40, "Online": false }, { - "Name": "Wallet4", - "Stake": 25, + "Name": "Wallet4-NPN1", + "Stake": 10, "Online": false } ] diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/net.json b/test/testdata/deployednettemplates/recipes/feature-networks/net.json index 7d03c46692..e6091c40b5 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/net.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/net.json @@ -8,7 +8,11 @@ "IsRelay": true, "Wallets": [ { - "Name": "Wallet1", + "Name": "Wallet1-R1", + "ParticipationOnly": false + }, + { + "Name": "Wallet3-Dispenser", "ParticipationOnly": false } ], @@ -33,7 +37,32 @@ "IsRelay": true, "Wallets": [ { - "Name": "Wallet2", + "Name": "Wallet2-R2", + "ParticipationOnly": false + } + ], + "NetAddress": "{{NetworkPort}}", + "APIEndpoint": "{{APIEndpoint}}", + "APIToken": "{{APIToken}}", + "EnableTelemetry": true, + "TelemetryURI": "{{TelemetryURI}}", + "EnableMetrics": true, + "MetricsURI": "{{MetricsURI}}", + "EnableService": false, + "EnableBlockStats": true, + "ConfigJSONOverride": "{ \"DNSBootstrapID\": \".algodev.network\",\"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"EnableAgreementReporting\": true, \"EnableAgreementTimeMetrics\": true, \"EnableAssembleStats\": true, \"EnableProcessBlockStats\": true }" + } + ] + }, + { + "Name": "NPN1", + "Nodes": [ + { + "Name": "node1", + "IsRelay": false, + "Wallets": [ + { + "Name": "Wallet4-NPN1", "ParticipationOnly": false } ], diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/topology.json b/test/testdata/deployednettemplates/recipes/feature-networks/topology.json index 8633245a46..360c9d0d49 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/topology.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/topology.json @@ -7,6 +7,10 @@ { "Name": "R2", "Template": "AWS-US-EAST-2-Large" + }, + { + "Name": "NPN1", + "Template": "AWS-US-EAST-2-Large" } ] } From 974c8f8e5031c93534eab03840dfe495ec8b9457 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Fri, 21 Jan 2022 16:23:24 -0500 Subject: [PATCH 4/4] updated dns for centralized telemetry server for feature networks --- .../deployednettemplates/recipes/feature-networks/net.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testdata/deployednettemplates/recipes/feature-networks/net.json b/test/testdata/deployednettemplates/recipes/feature-networks/net.json index e6091c40b5..cbab021641 100644 --- a/test/testdata/deployednettemplates/recipes/feature-networks/net.json +++ b/test/testdata/deployednettemplates/recipes/feature-networks/net.json @@ -20,7 +20,7 @@ "APIEndpoint": "{{APIEndpoint}}", "APIToken": "{{APIToken}}", "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", + "TelemetryURI": "telemetry.feature-networks.algodev.network", "EnableMetrics": true, "MetricsURI": "{{MetricsURI}}", "EnableService": false, @@ -45,7 +45,7 @@ "APIEndpoint": "{{APIEndpoint}}", "APIToken": "{{APIToken}}", "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", + "TelemetryURI": "telemetry.feature-networks.algodev.network", "EnableMetrics": true, "MetricsURI": "{{MetricsURI}}", "EnableService": false, @@ -70,7 +70,7 @@ "APIEndpoint": "{{APIEndpoint}}", "APIToken": "{{APIToken}}", "EnableTelemetry": true, - "TelemetryURI": "{{TelemetryURI}}", + "TelemetryURI": "telemetry.feature-networks.algodev.network", "EnableMetrics": true, "MetricsURI": "{{MetricsURI}}", "EnableService": false,