Skip to content
This repository was archived by the owner on Feb 28, 2023. It is now read-only.

New testnet re-deployment changes #11

Merged
3 commits merged into from
Nov 18, 2020
Merged

New testnet re-deployment changes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
273c8f5
New testnet re-deployment changes
Nov 18, 2020
e7eca3c
Removed unused configurations for faucet backend
Nov 18, 2020
17f1f71
Update path to instances vault for faucet as well
Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions jobs/mantis-qa-load.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,6 @@ let
in [
{
data = ''
include "${mantis-faucet}/conf/testnet-internal.conf"
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"

faucet {
# Base directory where all the data used by the faucet is stored
datadir = "/local/mantis-faucet"
Expand Down Expand Up @@ -512,18 +509,6 @@ let
}
}
}

mantis.blockchains.testnet-internal.bootstrap-nodes = [
{{ range service "${namespace}-mantis-miner" -}}
"enode:// {{- with secret (printf "kv/data/nomad-cluster/${namespace}/%s/enode-hash" .ServiceMeta.Name) -}}
{{- .Data.data.value -}}
{{- end -}}@{{ .Address }}:{{ .Port }}",
{{ end -}}
]

mantis.client-id = "${faucetName}"
mantis.metrics.enabled = true
mantis.metrics.port = {{ env "NOMAD_PORT_metrics" }}
'';
changeMode = "noop";
destination = "local/faucet.conf";
Expand Down
27 changes: 9 additions & 18 deletions jobs/mantis.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ let
let secret = key: ''{{ with secret "${key}" }}{{.Data.data.value}}{{end}}'';
in [
{
# FIXME: pow-target-time was only temporarily changed here, should be included on the default testnet-internal on next version of mantis
data = ''
include "${mantis}/conf/testnet-internal.conf"

Expand All @@ -43,6 +44,8 @@ let
mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"

mantis.blockchains.testnet-internal.pow-target-time = 30 seconds
'';
destination = "local/mantis.conf";
changeMode = "noop";
Expand Down Expand Up @@ -273,6 +276,7 @@ let

templates = [
{
# FIXME: pow-target-time was only temporarily changed here, should be included on the default testnet-internal on next version of mantis
data = ''
include "${mantis}/conf/testnet-internal.conf"

Expand All @@ -297,6 +301,8 @@ let
mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"

mantis.blockchains.testnet-internal.pow-target-time = 30 seconds
'';
changeMode = "restart";
destination = "local/mantis.conf";
Expand Down Expand Up @@ -503,16 +509,13 @@ let
in [
{
data = ''
include "${mantis-faucet}/conf/testnet-internal.conf"
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"

faucet {
# Base directory where all the data used by the faucet is stored
datadir = "/local/mantis-faucet"

# Wallet address used to send transactions from
wallet-address =
{{- with secret "kv/nomad-cluster/${namespace}/${namespace}-mantis-1/coinbase" -}}
{{- with secret "kv/nomad-cluster/${namespace}/mantis-1/coinbase" -}}
"{{.Data.data.value}}"
{{- end }}

Expand Down Expand Up @@ -601,34 +604,22 @@ let
}
}
}

mantis.blockchains.testnet-internal.bootstrap-nodes = [
{{ range service "${namespace}-mantis-miner" -}}
"enode:// {{- with secret (printf "kv/data/nomad-cluster/${namespace}/%s/enode-hash" .ServiceMeta.Name) -}}
{{- .Data.data.value -}}
{{- end -}}@{{ .Address }}:{{ .Port }}",
{{ end -}}
]

mantis.client-id = "${faucetName}"
mantis.metrics.enabled = true
mantis.metrics.port = {{ env "NOMAD_PORT_metrics" }}
'';
changeMode = "noop";
destination = "local/faucet.conf";
}
genesisJson
{
data = ''
{{- with secret "kv/data/nomad-cluster/${namespace}/${namespace}-mantis-1/account" -}}
{{- with secret "kv/data/nomad-cluster/${namespace}/mantis-1/account" -}}
{{.Data.data | toJSON }}
{{- end -}}
'';
destination = "secrets/account";
}
{
data = ''
COINBASE={{- with secret "kv/data/nomad-cluster/${namespace}/${namespace}-mantis-1/coinbase" -}}{{ .Data.data.value }}{{- end -}}
COINBASE={{- with secret "kv/data/nomad-cluster/${namespace}/mantis-1/coinbase" -}}{{ .Data.data.value }}{{- end -}}
'';
destination = "secrets/env";
env = true;
Expand Down
16 changes: 10 additions & 6 deletions overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ in {
# The branch was `chore/update-sbt-add-nix`, for future reference.
mantis-source = builtins.fetchGit {
url = "https://github.com/input-output-hk/mantis";
rev = "df2916bccd53b2ccc5c3758e5aa7f272c6fbb4fe";
rev = "dcb6d7b714bc1e23f75dd3e62365b316dab68ec3";
ref = "develop";
submodules = true;
};

mantis-faucet-source = builtins.fetchGit {
url = "https://github.com/input-output-hk/mantis";
rev = "df2916bccd53b2ccc5c3758e5aa7f272c6fbb4fe";
rev = "dcb6d7b714bc1e23f75dd3e62365b316dab68ec3";
ref = "develop";
submodules = true;
};
Expand All @@ -29,6 +29,10 @@ in {

mantis-faucet = import final.mantis-faucet-source { inherit system; };

# Any:
# - run of this command with a parameter different than the testnet (currently 10)
# - change in the genesis file here
# Requires an update on the mantis repository and viceversa
generate-mantis-keys = let
mantisConfigJson = {
mantis = {
Expand Down Expand Up @@ -119,10 +123,10 @@ in {
for count in $(seq "$desired"); do
keyFile="secrets/mantis-$count.key"
coinbaseFile="secrets/mantis-$count.coinbase"
secretKeyPath="kv/nomad-cluster/$prefix/testnet-mantis-$count/secret-key"
hashKeyPath="kv/nomad-cluster/$prefix/testnet-mantis-$count/enode-hash"
coinbasePath="kv/nomad-cluster/$prefix/testnet-mantis-$count/coinbase"
accountPath="kv/nomad-cluster/$prefix/testnet-mantis-$count/account"
secretKeyPath="kv/nomad-cluster/$prefix/mantis-$count/secret-key"
hashKeyPath="kv/nomad-cluster/$prefix/mantis-$count/enode-hash"
coinbasePath="kv/nomad-cluster/$prefix/mantis-$count/coinbase"
accountPath="kv/nomad-cluster/$prefix/mantis-$count/account"
genesisPath="kv/nomad-cluster/$prefix/genesis"

hashKey="$(vault kv get -field value "$hashKeyPath" || true)"
Expand Down