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

Commit 53164bc

Browse files
author
Nicolas Tallar
committed
Adapted mantis usage due to config refactor
1 parent 331e9a1 commit 53164bc

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎jobs/mantis-qa-load.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ let
1818
in [
1919
{
2020
data = ''
21-
include "${mantis}/conf/testnet-internal.conf"
21+
include "${mantis}/conf/testnet-internal-nomad.conf"
2222
2323
logging.json-output = true
2424
logging.logs-file = "logs"
2525
26-
mantis.blockchains.testnet-internal.bootstrap-nodes = [
26+
mantis.blockchains.testnet-internal-nomad.bootstrap-nodes = [
2727
{{ range service "${namespace}-mantis-miner" -}}
2828
"enode:// {{- with secret (printf "kv/data/nomad-cluster/${namespace}/%s/enode-hash" .ServiceMeta.Name) -}}
2929
{{- .Data.data.value -}}
@@ -41,7 +41,7 @@ let
4141
mantis.network.rpc.http.interface = "0.0.0.0"
4242
mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
4343
mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
44-
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
44+
mantis.blockchains.testnet-internal-nomad.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
4545
'';
4646
destination = "local/mantis.conf";
4747
changeMode = "noop";
@@ -273,12 +273,12 @@ let
273273
templates = [
274274
{
275275
data = ''
276-
include "${mantis}/conf/testnet-internal.conf"
276+
include "${mantis}/conf/testnet-internal-nomad.conf"
277277
278278
logging.json-output = true
279279
logging.logs-file = "logs"
280280
281-
mantis.blockchains.testnet-internal.bootstrap-nodes = [
281+
mantis.blockchains.testnet-internal-nomad.bootstrap-nodes = [
282282
{{ range service "${namespace}-mantis-miner" -}}
283283
"enode:// {{- with secret (printf "kv/data/nomad-cluster/${namespace}/%s/enode-hash" .ServiceMeta.Name) -}}
284284
{{- .Data.data.value -}}
@@ -295,7 +295,7 @@ let
295295
mantis.network.rpc.http.interface = "0.0.0.0"
296296
mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
297297
mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
298-
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
298+
mantis.blockchains.testnet-internal-nomad.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
299299
'';
300300
changeMode = "restart";
301301
destination = "local/mantis.conf";

‎jobs/mantis.nix‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ let
1818
let secret = key: ''{{ with secret "${key}" }}{{.Data.data.value}}{{end}}'';
1919
in [
2020
{
21-
# FIXME: pow-target-time was only temporarily changed here, should be included on the default testnet-internal on next version of mantis
2221
data = ''
23-
include "${mantis}/conf/testnet-internal.conf"
22+
include "${mantis}/conf/testnet-internal-nomad.conf"
2423
2524
logging.json-output = true
2625
logging.logs-file = "logs"
2726
28-
mantis.blockchains.testnet-internal.bootstrap-nodes = [
27+
mantis.blockchains.testnet-internal-nomad.bootstrap-nodes = [
2928
{{ range service "${namespace}-mantis-miner" -}}
3029
"enode:// {{- with secret (printf "kv/data/nomad-cluster/${namespace}/%s/enode-hash" .ServiceMeta.Name) -}}
3130
{{- .Data.data.value -}}
@@ -43,9 +42,10 @@ let
4342
mantis.network.rpc.http.interface = "0.0.0.0"
4443
mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
4544
mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
46-
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
45+
mantis.blockchains.testnet-internal-nomad.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
4746
48-
mantis.blockchains.testnet-internal.pow-target-time = 30 seconds
47+
mantis.blockchains.testnet-internal-nomad.ecip1098-block-number = 0
48+
mantis.blockchains.testnet-internal-nomad.ecip1097-block-number = 0
4949
'';
5050
destination = "local/mantis.conf";
5151
changeMode = "noop";
@@ -279,14 +279,13 @@ let
279279

280280
templates = [
281281
{
282-
# FIXME: pow-target-time was only temporarily changed here, should be included on the default testnet-internal on next version of mantis
283282
data = ''
284-
include "${mantis}/conf/testnet-internal.conf"
283+
include "${mantis}/conf/testnet-internal-nomad.conf"
285284
286285
logging.json-output = true
287286
logging.logs-file = "logs"
288287
289-
mantis.blockchains.testnet-internal.bootstrap-nodes = [
288+
mantis.blockchains.testnet-internal-nomad.bootstrap-nodes = [
290289
{{ range service "${namespace}-mantis-miner" -}}
291290
"enode:// {{- with secret (printf "kv/data/nomad-cluster/${namespace}/%s/enode-hash" .ServiceMeta.Name) -}}
292291
{{- .Data.data.value -}}
@@ -303,9 +302,10 @@ let
303302
mantis.network.rpc.http.interface = "0.0.0.0"
304303
mantis.network.rpc.http.port = {{ env "NOMAD_PORT_rpc" }}
305304
mantis.network.server-address.port = {{ env "NOMAD_PORT_server" }}
306-
mantis.blockchains.testnet-internal.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
305+
mantis.blockchains.testnet-internal-nomad.custom-genesis-file = "{{ env "NOMAD_TASK_DIR" }}/genesis.json"
307306
308-
mantis.blockchains.testnet-internal.pow-target-time = 30 seconds
307+
mantis.blockchains.testnet-internal-nomad.ecip1098-block-number = 0
308+
mantis.blockchains.testnet-internal-nomad.ecip1097-block-number = 0
309309
'';
310310
changeMode = "restart";
311311
destination = "local/mantis.conf";

‎overlay.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ in {
1010
# The branch was `chore/update-sbt-add-nix`, for future reference.
1111
mantis-source = builtins.fetchGit {
1212
url = "https://github.com/input-output-hk/mantis";
13-
rev = "aaf3c852b4882369ac5a0f518344d9b02e63b8ef";
13+
rev = "057f84ca72914c7175a0df1d8e40df9c83a9ed6f";
1414
ref = "develop";
1515
submodules = true;
1616
};
1717

1818
mantis-faucet-source = builtins.fetchGit {
1919
url = "https://github.com/input-output-hk/mantis";
20-
rev = "dcb6d7b714bc1e23f75dd3e62365b316dab68ec3";
20+
rev = "057f84ca72914c7175a0df1d8e40df9c83a9ed6f";
2121
ref = "develop";
2222
submodules = true;
2323
};
@@ -37,7 +37,7 @@ in {
3737
mantisConfigJson = {
3838
mantis = {
3939
consensus.mining-enabled = false;
40-
blockchains.network = "testnet-internal";
40+
blockchains.network = "testnet-internal-nomad";
4141

4242
network.rpc = {
4343
http = {
@@ -54,7 +54,7 @@ in {
5454
mantisConfigHocon =
5555
prev.runCommand "mantis.conf" { buildInputs = [ prev.jq ]; } ''
5656
cat <<EOF > $out
57-
include "${final.mantis}/conf/testnet-internal.conf"
57+
include "${final.mantis}/conf/testnet-internal-nomad.conf"
5858
EOF
5959
6060
jq . < ${
@@ -138,7 +138,7 @@ in {
138138
len=0
139139
until [ $len -eq 194 ]; do
140140
echo "generating key..."
141-
len="$( eckeygen -Dconfig.file=${final.mantis}/conf/mantis.conf | tee "$keyFile" | wc -c )"
141+
len="$( eckeygen -Dconfig.file=${final.mantis}/conf/app.conf | tee "$keyFile" | wc -c )"
142142
done
143143
fi
144144
@@ -153,7 +153,7 @@ in {
153153
coinbase="$(generateCoinbase "$secretKey")"
154154
vault kv put "$coinbasePath" "value=$coinbase"
155155
156-
cat $tmpdir/.mantis/testnet-internal/keystore/*$coinbase | vault kv put "$accountPath" -
156+
cat $tmpdir/.mantis/testnet-internal-nomad/keystore/*$coinbase | vault kv put "$accountPath" -
157157
else
158158
echo "Downloading key for $keyFile from Vault"
159159
secretKey="$(vault kv get -field value "$secretKeyPath")"

‎templates/mantis.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
include "./result/conf/testnet-internal.conf"
1+
include "./result/conf/testnet-internal-nomad.conf"
22

33
mantis.consensus.mining-enabled = false
44
mantis.blockchains.testnet-internal.custom-genesis-file = "./genesis.json"
55

6-
mantis.blockchains.testnet-internal.bootstrap-nodes = [
6+
mantis.blockchains.testnet-internal-nomad.bootstrap-nodes = [
77
{{ range service "mantis-testnet-mantis-miner" -}}
88
"enode:// {{- with secret (printf "kv/data/nomad-cluster/testnet/%s/enode-hash" .ServiceMeta.Name) -}}
99
{{- .Data.data.value -}}

0 commit comments

Comments
 (0)