feat: add geth zero fee addresses

primev · Nov 26, 2024 · eca7ead · eca7ead
1 parent a6f22d0
commit eca7ead
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/external/geth b/external/geth
diff --git a/infrastructure/nomad/playbooks/templates/jobs/contracts-deployer.nomad.j2 b/infrastructure/nomad/playbooks/templates/jobs/contracts-deployer.nomad.j2
@@ -51,10 +51,17 @@ job "{{ job.name }}" {
     task "contracts" {
       driver = "exec"
 
+      {% if profile == 'testnet' %}
       resources {
         cpu = 4000
         memory = 2048
       }
+      {% elif profile == 'stressnet' or profile == 'stressnet-wl1' %}
+      resources {
+        cpu = 2000
+        memory = 1024
+      }
+      {% endif %}
 
       {% for port_name in job.ports[0] %}
       service {

diff --git a/infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2 b/infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2
@@ -170,6 +170,19 @@ job "{{ job.name }}" {
             {% endif %}
           {% endif %}
 
+          {%- raw %}
+          {{ with secret "secret/data/mev-commit" }}
+          GETH_ZERO_FEE_ADDRESSES="$(echo '{{ .Data.data.contract_deployer_keystore_filename }}' | awk -F'--' '{print "0x"$3}')"
+          {{ end }}
+          {{ with secret "secret/data/mev-commit" }}
+          GETH_ZERO_FEE_ADDRESSES+=",$(echo '{{ .Data.data.oracle_keystore_filename }}' | awk -F'--' '{print "0x"$3}')"
+          {{ end }}
+          {{ with secret "secret/data/mev-commit" }}
+          GETH_ZERO_FEE_ADDRESSES+=",$(echo '{{ .Data.data.bridge_relayer_keystore_filename }}' | awk -F'--' '{print "0x"$3}')"
+          {{ end }}
+          {% endraw %}
+
+          export GETH_ZERO_FEE_ADDRESSES
           chmod +x local/mev-commit-geth local/entrypoint.sh
           exec local/entrypoint.sh
         EOH

diff --git a/infrastructure/nomad/playbooks/templates/jobs/mock-l1.nomad.j2 b/infrastructure/nomad/playbooks/templates/jobs/mock-l1.nomad.j2
@@ -39,9 +39,15 @@ job "{{ job.name }}" {
     task "geth" {
       driver = "exec"
 
+      {% if profile == 'stressnet' or profile == 'stressnet-wl1' %}
       resources {
         memory = 4096
       }
+      {% else %}
+      resources {
+        memory = 1024
+      }
+      {% endif %}
 
       {% for port_name in job.ports[0] %}
       service {

diff --git a/infrastructure/nomad/playbooks/variables/profiles.yml b/infrastructure/nomad/playbooks/variables/profiles.yml
@@ -726,13 +726,13 @@ profiles:
       - *mev_commit_geth_signer_node1_job
       - *mev_commit_geth_member_node_job
       - *contracts_deployer_job
+      - *mev_commit_bridge_job
       - *mev_commit_dashboard_job
       - *mev_commit_bootnode1_job
       - *mev_commit_provider_node1_job
       - *mev_commit_provider_node1_funder_job
       - *mev_commit_oracle_job
       - *mev_commit_provider_emulator_node1_job
-      - *mev_commit_faucet_job
       - *datadog_agent_metrics_collector_job
 
   stressnet:
+1 −0		cmd/geth/main.go
+14 −1		cmd/utils/flags.go
+7 −1		core/state_transition.go
+32 −0		core/vm/contracts.go
+5 −4		core/vm/interpreter.go
+10 −0		geth-poa/entrypoint.sh
+1 −0		geth-poa/genesis.json
+4 −1		go.mod
+2 −0		go.sum
+2 −0		params/protocol_params.go