refactor: include env in the genesis and config file name (#563)

Author: mrekucci

infrastructure/nomad/playbooks/deploy.yml

@@ -425,7 +425,7 @@
           echo "Error: No static nodes found."
           exit 1
         fi
-        cat "${STATIC_NODES}" | remarshal --if json --of toml - > "{{ dist_dir }}/config_{{ environments[env].version }}.toml"
+        cat "${STATIC_NODES}" | remarshal --if json --of toml - > "{{ dist_dir }}/config_{{ env }}-{{ environments[env].version }}.toml"
       args:
         executable: bash
       delegate_to: localhost
@@ -538,7 +538,7 @@
           "extradata": "${EXTRADATA}"
         }
         EOH
-        ) | jq -c '.' > "{{ dist_dir }}/genesis_{{ environments[env].version }}.json"
+        ) | jq -c '.' > "{{ dist_dir }}/genesis_{{ env }}-{{ environments[env].version }}.json"
       args:
         executable: bash
       delegate_to: localhost

infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2

@@ -75,20 +75,20 @@ job "{{ job.name }}" {
 
       {% if env != 'devenv' %}
       artifact {
-        source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/config_{{ version }}.toml"
+        source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/config_{{ env }}-{{ version }}.toml"
       }
       artifact {
-        source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/genesis_{{ version }}.json"
+        source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/genesis_{{ env }}-{{ version }}.json"
       }
       artifact {
         source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/mev-commit-geth_{{ version }}_Linux_{{ target_system_architecture }}.tar.gz"
       }
       {% else %}
       artifact {
-        source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/config_{{ version }}.toml"
+        source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/config_{{ env }}-{{ version }}.toml"
       }
       artifact {
-        source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/genesis_{{ version }}.json"
+        source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/genesis_{{ env }}-{{ version }}.json"
       }
       artifact {
         source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/mev-commit-geth_{{ version }}_Linux_{{ target_system_architecture }}.tar.gz"
@@ -100,8 +100,8 @@ job "{{ job.name }}" {
           {%- raw %}
           GETH_DATA_DIR="/local/data/{% endraw %}{{ job.name }}{% raw %}/node-{{ env "NOMAD_ALLOC_INDEX" }}"
           {% endraw %}
-          GETH_CONFIG="local/config_{{ version }}.toml"
-          GENESIS_L1_PATH="local/genesis_{{ version }}.json"
+          GETH_CONFIG="local/config_{{ env }}-{{ version }}.toml"
+          GENESIS_L1_PATH="local/genesis_{{ env }}-{{ version }}.json"
           GETH_BIN_PATH="local/mev-commit-geth"
           NODE_IP="{{ job.env['ip'] }}"
           {% if job.env['type'] != 'signer' %}

infrastructure/nomad/playbooks/templates/jobs/mock-l1.nomad.j2

@@ -63,11 +63,11 @@ job "{{ job.name }}" {
       }
       {% if env != 'devenv' %}
       artifact {
-        source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/genesis_{{ version }}.json"
+        source = "https://primev-infrastructure-artifacts.s3.us-west-2.amazonaws.com/genesis_{{ env }}-{{ version }}.json"
       }
       {% else %}
       artifact {
-        source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/genesis_{{ version }}.json"
+        source = "http://{{ ansible_facts['default_ipv4']['address'] }}:1111/genesis_{{ env }}-{{ version }}.json"
       }
       {% endif %}
 
@@ -91,7 +91,7 @@ job "{{ job.name }}" {
             .[0].alloc = .[1].alloc
             | .[0].config.chainId = .[1].config.chainId
             | .[0]
-          ' local/default_genesis.json local/genesis_{{ version }}.json > local/genesis.json
+          ' local/default_genesis.json local/genesis_{{ env }}-{{ version }}.json > local/genesis.json
           ${GETH_BIN} --datadir local/data init local/genesis.json
 
           exec ${GETH_BIN} \