From 66a821ee9d5c898a07d3bbb76a00312fbe5a65af Mon Sep 17 00:00:00 2001 From: Mikelle Date: Mon, 13 May 2024 18:39:23 +0200 Subject: [PATCH 01/11] fix: updating infra for privacy --- infrastructure/nomad/deploy.yml | 9 ++++++-- infrastructure/nomad/jobs.yml | 17 +-------------- .../nomad/mev-commit-secrets.json.example | 13 ++++++++++++ .../nomad/mev-commit-emulator.nomad.j2 | 2 -- .../nomad/mev-commit-funder.nomad.j2 | 2 +- .../nomad/mev-commit-oracle.nomad.j2 | 21 ++++++++++++++++--- .../nomad/templates/nomad/mev-commit.nomad.j2 | 3 +++ 7 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 infrastructure/nomad/mev-commit-secrets.json.example diff --git a/infrastructure/nomad/deploy.yml b/infrastructure/nomad/deploy.yml index 69c970d00..1e4984c6e 100644 --- a/infrastructure/nomad/deploy.yml +++ b/infrastructure/nomad/deploy.yml @@ -9,6 +9,11 @@ tls_crt_file: "/etc/ssl/certs/mev-commit_{{ env }}.mev-commit.primev.xyz.crt" tls_key_file: "/etc/ssl/private/mev-commit_{{ env }}.mev-commit.primev.xyz.key" aws_s3_bucket: "primev-infrastructure-artifacts" + preconf_contract_address: "0x2Aff805aBdF1Fe79AfcF8B3a9B4B45ECcD6b6D6e" + blocktracker_contract_address: "0x042744D8cF66d8455350D43F9e09CA73b5C0CB94" + oracle_contract_address: "0x77A4FE615de28fdf0bF68D9B9ba773A32b5C7630" + bidder_registry_contract_address: "0x1E218818D409E0f00dfeBE8A960F7585d4fDff70" + provider_registry_contract_address: "0x0332388390d9df01cA3d26269f2B1Fc314deD9c0" profiles: devnet: job_names: @@ -20,11 +25,11 @@ - 'mev-commit-bootnode1' - 'mev-commit-provider-node1' - 'mev-commit-provider-node1-funder' + - 'mev-commit-oracle' - 'mev-commit-bidder-node1' - 'mev-commit-bidder-node1-funder' - 'mev-commit-provider-emulator-node1' - 'mev-commit-bidder-emulator-node1' - - 'mev-commit-oracle' - 'datadog-agent-metrics-collector' testnet: job_names: @@ -124,7 +129,7 @@ loop: - infrastructure/tools/keystore-generator - p2p/integrationtest/provider - - p2p/integrationtest/bidder + - p2p/integrationtest/real-bidder - bridge/standard/bridge-v1 - external/geth - contracts diff --git a/infrastructure/nomad/jobs.yml b/infrastructure/nomad/jobs.yml index 5f99fbdbe..dc03adde3 100644 --- a/infrastructure/nomad/jobs.yml +++ b/infrastructure/nomad/jobs.yml @@ -39,21 +39,6 @@ jobs: sync-mode: snap block-address: "0xd9cd8E5DE6d55f796D980B818D350C0746C25b97" - - name: mev-commit-geth-signer-node2 - template: mev-commit-geth.nomad.j2 - count: 1 - ports: - - metrics: - to: 6060 - p2p: - to: 30311 - env: - ip: 0.0.0.0 - net-restrict: 0.0.0.0/0 - type: signer - sync-mode: snap - block-address: "0x788EBABe5c3dD422Ef92Ca6714A69e2eabcE1Ee4" - - name: mev-commit-geth-member-node template: mev-commit-geth.nomad.j2 count: 1 @@ -182,7 +167,7 @@ jobs: http: to: 8080 env: - l1-rpc-url: https://rpc.sepolia.org + l1-rpc-url: https://ethereum-holesky-rpc.publicnode.com - name: mev-commit-bridge template: mev-commit-bridge.nomad.j2 diff --git a/infrastructure/nomad/mev-commit-secrets.json.example b/infrastructure/nomad/mev-commit-secrets.json.example new file mode 100644 index 000000000..dafcf937f --- /dev/null +++ b/infrastructure/nomad/mev-commit-secrets.json.example @@ -0,0 +1,13 @@ +{ + "bootnode1_keystore_password": "primev", + "provider1_keystore_password": "primev", + "bidder1_keystore_password": "primev", + "geth_bootnode1_boot_key": "", + "geth_signer1_keystore_password": "primev", + "geth_signer2_keystore_password": "primev", + "geth_signer3_keystore_password": "primev", + "oracle_keystore_password": "primev", + "oracle_private_key": "" + "oracle_db_password": "primev", + "deploy_contracts_private_key": "" +} diff --git a/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 index 4b6222670..ac2d7d461 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 @@ -88,8 +88,6 @@ job "{{ job.name }}" { {% if job.target_type == 'bidder' %} -rpc-addr "${EMULATOR_SETTLEMENT_RPC_ENDPOINT}" \ {% endif %} - -log-tags "${EMULATOR_LOG_TAGS}" \ - -log-fmt "${EMULATOR_LOG_FMT}" EOH destination = "local/run.sh" perms = "0755" diff --git a/infrastructure/nomad/templates/nomad/mev-commit-funder.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-funder.nomad.j2 index 9729d2aa6..51be14c68 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-funder.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-funder.nomad.j2 @@ -53,7 +53,7 @@ job "{{ job.name }}" { local/cast send \ --rpc-url http://{{ .Address }}:{{ .Port }} \ --private-key 0x7c9bf0f015874594d321c1c01ada3166c3509bbd91f76f9e4d7380c2df269c55 ${ETHEREUM_ADDRESS} \ - --value 100ether + --value 1000ether {{- end }} {{- end }} {% endraw %} diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index 139b95b79..7a9ddb29b 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -134,11 +134,12 @@ job "{{ job.name }}" { else 'service:' + job.name + '-{{ env "NOMAD_ALLOC_INDEX" }}' }}" MEV_ORACLE_LOG_LEVEL="{{ job.env.get('log-level', 'info') }}" - MEV_ORACLE_LAGGERD_MODE="{{ job.env.get('laggerd-mode', '64') }}" + MEV_ORACLE_LAGGERD_MODE="{{ job.env.get('laggerd-mode', '20') }}" MEV_ORACLE_L1_RPC_URL="{{ job.env['l1-rpc-url'] }}" {%- raw %} - MEV_ORACLE_KEYSTORE_PATH="/local/data-{{env "NOMAD_ALLOC_INDEX"}}/keystore" - MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" + # MEV_ORACLE_KEYSTORE_PATH="/local/data-{{env "NOMAD_ALLOC_INDEX"}}/keystore" + # MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" + MEV_ORACLE_PRIV_KEY_FILE = "/local/data-{{env "NOMAD_ALLOC_INDEX"}}/priv-key" {{- range nomadService "mev-commit-oracle" }} {{- if contains "http" .Tags }} MEV_ORACLE_HTTP_PORT="{{ .Port }}" @@ -148,6 +149,9 @@ job "{{ job.name }}" { {{- if contains "http" .Tags }} MEV_ORACLE_SETTLEMENT_RPC_URL="http://{{ .Address }}:{{ .Port }}" {{- end }} + {{- if contains "ws" .Tags }} + MEV_ORACLE_SETTLEMENT_WS_RPC_ENDPOINT="ws://{{ .Address}}:{{ .Port }}" + {{- end }} {{- end }} {{- range nomadService "{% endraw %}{{ job.name }}{% raw %}" }} {{- if contains "db" .Tags }} @@ -168,6 +172,16 @@ job "{{ job.name }}" { data = <<-EOH #!/usr/bin/env bash + {% raw %} + {{- range nomadService "mev-commit-provider-node1" }} + {{- if contains "http" .Tags }} + TOPOLOGY=$(curl https://{{ .Address}}:{{ .Port }}/topology) + PROVIDER_ETHEREUM_ADDRESS=$(echo ${TOPOLOGY} | jq -r '.self["Ethereum Address"]') + export MEV_ORACLE_OVERRIDE_WINNERS=${PROVIDER_ETHEREUM_ADDRESS} + {{- end }} + {{- end }} + {% endraw %} + {%- raw %} {{- range nomadService "datadog-agent-logs-collector" }} {{ if contains "tcp" .Tags }} @@ -185,6 +199,7 @@ job "{{ job.name }}" { fi mkdir -p $(dirname "${MEV_ORACLE_PRIV_KEY_FILE}") > /dev/null 2>&1 + echo {{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_private_key }}{{ end }} > ${MEV_ORACLE_PRIV_KEY_FILE} chmod +x local/mev-commit-oracle local/mev-commit-oracle start EOH diff --git a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 index a7b884c92..ddb45a4f4 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 @@ -65,6 +65,9 @@ job "{{ job.name }}" { {{- if contains "http" .Tags }} MEV_COMMIT_SETTLEMENT_RPC_ENDPOINT="http://{{ .Address }}:{{ .Port }}" {{- end }} + {{- if contains "ws" .Tags }} + MEV_COMMIT_SETTLEMENT_WS_RPC_ENDPOINT="ws://{{ .Address}}:{{ .Port }}" + {{- end }} {{- end }} {% endraw %} MEV_COMMIT_PEER_TYPE="{{ job.env['type'] }}" From a56bfe397fa0b79903e255e111b30dfa61470ce7 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Mon, 13 May 2024 19:53:34 +0200 Subject: [PATCH 02/11] fix: deleted secrets --- .../nomad/mev-commit-secrets.json.example | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 infrastructure/nomad/mev-commit-secrets.json.example diff --git a/infrastructure/nomad/mev-commit-secrets.json.example b/infrastructure/nomad/mev-commit-secrets.json.example deleted file mode 100644 index dafcf937f..000000000 --- a/infrastructure/nomad/mev-commit-secrets.json.example +++ /dev/null @@ -1,13 +0,0 @@ -{ - "bootnode1_keystore_password": "primev", - "provider1_keystore_password": "primev", - "bidder1_keystore_password": "primev", - "geth_bootnode1_boot_key": "", - "geth_signer1_keystore_password": "primev", - "geth_signer2_keystore_password": "primev", - "geth_signer3_keystore_password": "primev", - "oracle_keystore_password": "primev", - "oracle_private_key": "" - "oracle_db_password": "primev", - "deploy_contracts_private_key": "" -} From e7b44aa8a12ad2fcccda984a9ad73f147e5570a3 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Mon, 13 May 2024 19:55:51 +0200 Subject: [PATCH 03/11] fix: added raw --- infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index 7a9ddb29b..fabcf1fb2 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -199,7 +199,9 @@ job "{{ job.name }}" { fi mkdir -p $(dirname "${MEV_ORACLE_PRIV_KEY_FILE}") > /dev/null 2>&1 + {%- raw %} echo {{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_private_key }}{{ end }} > ${MEV_ORACLE_PRIV_KEY_FILE} + {% endraw %} chmod +x local/mev-commit-oracle local/mev-commit-oracle start EOH From 40af364772d3c217360d5caa932a140e46311be7 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Tue, 14 May 2024 14:57:59 +0200 Subject: [PATCH 04/11] fix: updated nomad --- infrastructure/nomad/deploy.yml | 52 +++++++++---------- infrastructure/nomad/jobs.yml | 17 ++++++ .../nomad/mev-commit-oracle.nomad.j2 | 5 ++ .../nomad/templates/nomad/mev-commit.nomad.j2 | 4 ++ 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/infrastructure/nomad/deploy.yml b/infrastructure/nomad/deploy.yml index 1e4984c6e..d8bc65795 100644 --- a/infrastructure/nomad/deploy.yml +++ b/infrastructure/nomad/deploy.yml @@ -17,33 +17,33 @@ profiles: devnet: job_names: - - 'datadog-agent-logs-collector' - - 'mev-commit-geth-bootnode1' - - 'mev-commit-geth-signer-node1' - - 'mev-commit-geth-member-node' - - 'deploy-contracts' - - 'mev-commit-bootnode1' - - 'mev-commit-provider-node1' - - 'mev-commit-provider-node1-funder' - - 'mev-commit-oracle' - - 'mev-commit-bidder-node1' - - 'mev-commit-bidder-node1-funder' - - 'mev-commit-provider-emulator-node1' - - 'mev-commit-bidder-emulator-node1' - - 'datadog-agent-metrics-collector' + # - 'datadog-agent-logs-collector' + - "mev-commit-geth-bootnode1" + - "mev-commit-geth-signer-node1" + - "mev-commit-geth-member-node" + - "deploy-contracts" + - "mev-commit-bootnode1" + - "mev-commit-provider-node1" + - "mev-commit-provider-node1-funder" + - "mev-commit-oracle" + - "mev-commit-bidder-node1" + - "mev-commit-bidder-node1-funder" + - "mev-commit-provider-emulator-node1" + - "mev-commit-bidder-emulator-node1" + - "datadog-agent-metrics-collector" testnet: job_names: - - 'datadog-agent-logs-collector' - - 'mev-commit-geth-bootnode1' - - 'mev-commit-geth-signer-node1' - - 'mev-commit-geth-member-node' - - 'deploy-contracts' - - 'mev-commit-bootnode1' - - 'mev-commit-provider-node1' - - 'mev-commit-provider-node1-funder' - - 'mev-commit-provider-emulator-node1' - - 'mev-commit-oracle' - - 'datadog-agent-metrics-collector' + - "datadog-agent-logs-collector" + - "mev-commit-geth-bootnode1" + - "mev-commit-geth-signer-node1" + - "mev-commit-geth-member-node" + - "deploy-contracts" + - "mev-commit-bootnode1" + - "mev-commit-provider-node1" + - "mev-commit-provider-node1-funder" + - "mev-commit-provider-emulator-node1" + - "mev-commit-oracle" + - "datadog-agent-metrics-collector" vars_prompt: - name: version @@ -108,7 +108,7 @@ ansible.builtin.file: path: "{{ destination }}" state: directory - mode: '0744' + mode: "0744" recurse: yes - name: Build | Nomad artifacts diff --git a/infrastructure/nomad/jobs.yml b/infrastructure/nomad/jobs.yml index dc03adde3..9ecaa58eb 100644 --- a/infrastructure/nomad/jobs.yml +++ b/infrastructure/nomad/jobs.yml @@ -16,6 +16,9 @@ jobs: http: static: 8545 to: 8545 + ws: + static: 8546 + to: 8546 p2p: to: 30301 env: @@ -105,6 +108,10 @@ jobs: nat-address: "{{ ansible_facts['default_ipv4']['address'] }}" tls-crt-file: "{{ tls_crt_file }}" tls-key-file: "{{ tls_key_file }}" + preconf-contract-address: "{{ preconf_contract_address }}" + blocktracker-contract-address: "{{ blocktracker_contract_address }}" + bidder-registry-contract-address: "{{ bidder_registry_contract_address }}" + provider-registry-contract-address: "{{ provider_registry_contract_address }}" - name: mev-commit-provider-node1-funder template: mev-commit-funder.nomad.j2 @@ -132,6 +139,10 @@ jobs: type: bidder tls-crt-file: "{{ tls_crt_file }}" tls-key-file: "{{ tls_key_file }}" + preconf-contract-address: "{{ preconf_contract_address }}" + blocktracker-contract-address: "{{ blocktracker_contract_address }}" + bidder-registry-contract-address: "{{ bidder_registry_contract_address }}" + provider-registry-contract-address: "{{ provider_registry_contract_address }}" - name: mev-commit-bidder-node1-funder template: mev-commit-funder.nomad.j2 @@ -165,9 +176,15 @@ jobs: static: 5432 to: 5432 http: + static: 8080 to: 8080 env: l1-rpc-url: https://ethereum-holesky-rpc.publicnode.com + preconf-contract-address: "{{ preconf_contract_address }}" + blocktracker-contract-address: "{{ blocktracker_contract_address }}" + bidder-registry-contract-address: "{{ bidder_registry_contract_address }}" + provider-registry-contract-address: "{{ provider_registry_contract_address }}" + oracle-contract-address: "{{ oracle_contract_address }}" - name: mev-commit-bridge template: mev-commit-bridge.nomad.j2 diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index fabcf1fb2..d0e153510 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -140,6 +140,11 @@ job "{{ job.name }}" { # MEV_ORACLE_KEYSTORE_PATH="/local/data-{{env "NOMAD_ALLOC_INDEX"}}/keystore" # MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" MEV_ORACLE_PRIV_KEY_FILE = "/local/data-{{env "NOMAD_ALLOC_INDEX"}}/priv-key" + MEV_ORACLE_PRECONF_CONTRACT_ADDR="{{ job.env['preconf-contract-addr'] }}" + MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR="{{ job.env['blocktracker-contract-addr'] }}" + MEV_ORACLE_ORACLE_CONTRACT_ADDR="{{ job.env['oracle-contract-addr'] }}" + MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR="{{ job.env['bidderregistry-contract-addr'] }}" + MEV_ORACLE_PROVIDERREGISTRY_CONTRACT_ADDR="{{ job.env['providerregistry-contract-addr'] }}" {{- range nomadService "mev-commit-oracle" }} {{- if contains "http" .Tags }} MEV_ORACLE_HTTP_PORT="{{ .Port }}" diff --git a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 index ddb45a4f4..5636062d3 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 @@ -76,6 +76,10 @@ job "{{ job.name }}" { MEV_COMMIT_P2P_ADDR="{{ job.env.get('p2p-address', '0.0.0.0') }}" MEV_COMMIT_SERVER_TLS_CERTIFICATE="{{ job.env['tls-crt-file'] }}" MEV_COMMIT_SERVER_TLS_PRIVATE_KEY="{{ job.env['tls-key-file'] }}" + MEV_COMMIT_PROVIDER_REGISTRY_ADDR="{{ job.env['provider-registry-addr'] }}" + MEV_COMMIT_BIDDER_REGISTRY_ADDR="{{ job.env['bidder-registry-addr'] }}" + MEV_COMMIT_PRECONF_ADDR="{{ job.env['preconf-addr'] }}" + MEV_COMMIT_BLOCK_TRACKER_ADDR="{{ job.env['block-tracker-addr'] }}" {% if job.env['type'] == 'provider' %} MEV_COMMIT_NAT_ADDR="{{ job.env['nat-address'] }}" {%- raw %} From 2bfb8878f9b5cd9490dd048bfb8f72f385b0d020 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Tue, 14 May 2024 15:12:04 +0200 Subject: [PATCH 05/11] fix: fixed job env --- .../nomad/templates/nomad/mev-commit-oracle.nomad.j2 | 8 ++++---- infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index d0e153510..21d1acbaa 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -141,10 +141,10 @@ job "{{ job.name }}" { # MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" MEV_ORACLE_PRIV_KEY_FILE = "/local/data-{{env "NOMAD_ALLOC_INDEX"}}/priv-key" MEV_ORACLE_PRECONF_CONTRACT_ADDR="{{ job.env['preconf-contract-addr'] }}" - MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR="{{ job.env['blocktracker-contract-addr'] }}" - MEV_ORACLE_ORACLE_CONTRACT_ADDR="{{ job.env['oracle-contract-addr'] }}" - MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR="{{ job.env['bidderregistry-contract-addr'] }}" - MEV_ORACLE_PROVIDERREGISTRY_CONTRACT_ADDR="{{ job.env['providerregistry-contract-addr'] }}" + MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR="{{ job.env['blocktracker-contract-address'] }}" + MEV_ORACLE_ORACLE_CONTRACT_ADDR="{{ job.env['oracle-contract-address'] }}" + MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR="{{ job.env['bidder-registry-contract-address'] }}" + MEV_ORACLE_PROVIDERREGISTRY_CONTRACT_ADDR="{{ job.env['provider-registry-contract-address'] }}" {{- range nomadService "mev-commit-oracle" }} {{- if contains "http" .Tags }} MEV_ORACLE_HTTP_PORT="{{ .Port }}" diff --git a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 index 5636062d3..99bfa63c1 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 @@ -76,10 +76,10 @@ job "{{ job.name }}" { MEV_COMMIT_P2P_ADDR="{{ job.env.get('p2p-address', '0.0.0.0') }}" MEV_COMMIT_SERVER_TLS_CERTIFICATE="{{ job.env['tls-crt-file'] }}" MEV_COMMIT_SERVER_TLS_PRIVATE_KEY="{{ job.env['tls-key-file'] }}" - MEV_COMMIT_PROVIDER_REGISTRY_ADDR="{{ job.env['provider-registry-addr'] }}" - MEV_COMMIT_BIDDER_REGISTRY_ADDR="{{ job.env['bidder-registry-addr'] }}" - MEV_COMMIT_PRECONF_ADDR="{{ job.env['preconf-addr'] }}" - MEV_COMMIT_BLOCK_TRACKER_ADDR="{{ job.env['block-tracker-addr'] }}" + MEV_COMMIT_PROVIDER_REGISTRY_ADDR="{{ job.env['provider-registry-contract-address'] }}" + MEV_COMMIT_BIDDER_REGISTRY_ADDR="{{ job.env['bidder-registry-contract-address'] }}" + MEV_COMMIT_PRECONF_ADDR="{{ job.env['preconf-contract-address'] }}" + MEV_COMMIT_BLOCK_TRACKER_ADDR="{{ job.env['blocktracker-contract-address'] }}" {% if job.env['type'] == 'provider' %} MEV_COMMIT_NAT_ADDR="{{ job.env['nat-address'] }}" {%- raw %} From d0a2bae1cefa04f23d55c28014ccdbe1a88340a9 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Tue, 14 May 2024 16:48:54 +0200 Subject: [PATCH 06/11] fix: fixing oracle nomad job --- .../nomad/templates/nomad/mev-commit-oracle.nomad.j2 | 11 +++++------ .../nomad/templates/nomad/mev-commit.nomad.j2 | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index 21d1acbaa..fa7c60d02 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -140,7 +140,7 @@ job "{{ job.name }}" { # MEV_ORACLE_KEYSTORE_PATH="/local/data-{{env "NOMAD_ALLOC_INDEX"}}/keystore" # MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" MEV_ORACLE_PRIV_KEY_FILE = "/local/data-{{env "NOMAD_ALLOC_INDEX"}}/priv-key" - MEV_ORACLE_PRECONF_CONTRACT_ADDR="{{ job.env['preconf-contract-addr'] }}" + MEV_ORACLE_PRECONF_CONTRACT_ADDR="{{ job.env['preconf-contract-address'] }}" MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR="{{ job.env['blocktracker-contract-address'] }}" MEV_ORACLE_ORACLE_CONTRACT_ADDR="{{ job.env['oracle-contract-address'] }}" MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR="{{ job.env['bidder-registry-contract-address'] }}" @@ -176,13 +176,12 @@ job "{{ job.name }}" { template { data = <<-EOH #!/usr/bin/env bash - - {% raw %} + {%- raw %} {{- range nomadService "mev-commit-provider-node1" }} {{- if contains "http" .Tags }} - TOPOLOGY=$(curl https://{{ .Address}}:{{ .Port }}/topology) - PROVIDER_ETHEREUM_ADDRESS=$(echo ${TOPOLOGY} | jq -r '.self["Ethereum Address"]') - export MEV_ORACLE_OVERRIDE_WINNERS=${PROVIDER_ETHEREUM_ADDRESS} + TOPOLOGY=$(curl https://{{ .Address}}:{{ .Port }}/topology) + PROVIDER_ETHEREUM_ADDRESS=$(echo ${TOPOLOGY} | jq -r '.self["Ethereum Address"]') + export MEV_ORACLE_OVERRIDE_WINNERS=${PROVIDER_ETHEREUM_ADDRESS} {{- end }} {{- end }} {% endraw %} diff --git a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 index 99bfa63c1..489306d16 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 @@ -76,10 +76,10 @@ job "{{ job.name }}" { MEV_COMMIT_P2P_ADDR="{{ job.env.get('p2p-address', '0.0.0.0') }}" MEV_COMMIT_SERVER_TLS_CERTIFICATE="{{ job.env['tls-crt-file'] }}" MEV_COMMIT_SERVER_TLS_PRIVATE_KEY="{{ job.env['tls-key-file'] }}" - MEV_COMMIT_PROVIDER_REGISTRY_ADDR="{{ job.env['provider-registry-contract-address'] }}" - MEV_COMMIT_BIDDER_REGISTRY_ADDR="{{ job.env['bidder-registry-contract-address'] }}" - MEV_COMMIT_PRECONF_ADDR="{{ job.env['preconf-contract-address'] }}" - MEV_COMMIT_BLOCK_TRACKER_ADDR="{{ job.env['blocktracker-contract-address'] }}" + MEV_COMMIT_PROVIDER_REGISTRY_ADDR="{{ job.env.get('provider-registry-contract-address') }}" + MEV_COMMIT_BIDDER_REGISTRY_ADDR="{{ job.env.get('bidder-registry-contract-address') }}" + MEV_COMMIT_PRECONF_ADDR="{{ job.env.get('preconf-contract-address') }}" + MEV_COMMIT_BLOCK_TRACKER_ADDR="{{ job.env.get('blocktracker-contract-address') }}" {% if job.env['type'] == 'provider' %} MEV_COMMIT_NAT_ADDR="{{ job.env['nat-address'] }}" {%- raw %} From b2b4b881c49f8f19c20b1c9d3eaafe7e3b6aa462 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Tue, 14 May 2024 17:09:44 +0200 Subject: [PATCH 07/11] fix: updated order --- infrastructure/nomad/jobs.yml | 36 +++++++++---------- .../nomad/mev-commit-oracle.nomad.j2 | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/infrastructure/nomad/jobs.yml b/infrastructure/nomad/jobs.yml index 9ecaa58eb..e418559fa 100644 --- a/infrastructure/nomad/jobs.yml +++ b/infrastructure/nomad/jobs.yml @@ -119,6 +119,24 @@ jobs: target_type: provider target_name: mev-commit-provider-node1 + - name: mev-commit-oracle + template: mev-commit-oracle.nomad.j2 + count: 1 + ports: + - db: + static: 5432 + to: 5432 + http: + static: 8080 + to: 8080 + env: + l1-rpc-url: https://ethereum-holesky-rpc.publicnode.com + preconf-contract-address: "{{ preconf_contract_address }}" + blocktracker-contract-address: "{{ blocktracker_contract_address }}" + bidder-registry-contract-address: "{{ bidder_registry_contract_address }}" + provider-registry-contract-address: "{{ provider_registry_contract_address }}" + oracle-contract-address: "{{ oracle_contract_address }}" + - name: mev-commit-bidder-node1 template: mev-commit.nomad.j2 count: 1 @@ -168,24 +186,6 @@ jobs: - metrics: to: 8080 - - name: mev-commit-oracle - template: mev-commit-oracle.nomad.j2 - count: 1 - ports: - - db: - static: 5432 - to: 5432 - http: - static: 8080 - to: 8080 - env: - l1-rpc-url: https://ethereum-holesky-rpc.publicnode.com - preconf-contract-address: "{{ preconf_contract_address }}" - blocktracker-contract-address: "{{ blocktracker_contract_address }}" - bidder-registry-contract-address: "{{ bidder_registry_contract_address }}" - provider-registry-contract-address: "{{ provider_registry_contract_address }}" - oracle-contract-address: "{{ oracle_contract_address }}" - - name: mev-commit-bridge template: mev-commit-bridge.nomad.j2 count: 1 diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index fa7c60d02..e0fa08f0f 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -178,11 +178,11 @@ job "{{ job.name }}" { #!/usr/bin/env bash {%- raw %} {{- range nomadService "mev-commit-provider-node1" }} - {{- if contains "http" .Tags }} + {{ if contains "http" .Tags }} TOPOLOGY=$(curl https://{{ .Address}}:{{ .Port }}/topology) PROVIDER_ETHEREUM_ADDRESS=$(echo ${TOPOLOGY} | jq -r '.self["Ethereum Address"]') export MEV_ORACLE_OVERRIDE_WINNERS=${PROVIDER_ETHEREUM_ADDRESS} - {{- end }} + {{ end }} {{- end }} {% endraw %} From 01bd86221336ed5ce778abf706b426c3e65e409a Mon Sep 17 00:00:00 2001 From: Mikelle Date: Wed, 15 May 2024 00:04:52 +0200 Subject: [PATCH 08/11] fix: updated infra --- infrastructure/nomad/deploy.yml | 2 +- infrastructure/nomad/jobs.yml | 6 ++++++ .../templates/nomad/mev-commit-emulator.nomad.j2 | 12 +++--------- .../nomad/templates/nomad/mev-commit-oracle.nomad.j2 | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/infrastructure/nomad/deploy.yml b/infrastructure/nomad/deploy.yml index d8bc65795..cd0fc51b4 100644 --- a/infrastructure/nomad/deploy.yml +++ b/infrastructure/nomad/deploy.yml @@ -183,7 +183,7 @@ - name: Deploy | Nomad jobs ansible.builtin.shell: | nomad run {{ destination }}/{{ job.name }}.nomad - [ "{{ job.name }}" = "deploy-contracts" ] && sleep 180 || true + [ "{{ job.name }}" = "deploy-contracts" ] && sleep 240 || true args: executable: bash loop: "{{ jobs }}" diff --git a/infrastructure/nomad/jobs.yml b/infrastructure/nomad/jobs.yml index e418559fa..bcf6679e3 100644 --- a/infrastructure/nomad/jobs.yml +++ b/infrastructure/nomad/jobs.yml @@ -86,6 +86,10 @@ jobs: type: bootnode tls-crt-file: "{{ tls_crt_file }}" tls-key-file: "{{ tls_key_file }}" + preconf-contract-address: "{{ preconf_contract_address }}" + blocktracker-contract-address: "{{ blocktracker_contract_address }}" + bidder-registry-contract-address: "{{ bidder_registry_contract_address }}" + provider-registry-contract-address: "{{ provider_registry_contract_address }}" - name: mev-commit-provider-node1 template: mev-commit.nomad.j2 @@ -185,6 +189,8 @@ jobs: ports: - metrics: to: 8080 + env: + l1-rpc-url: https://ethereum-holesky-rpc.publicnode.com - name: mev-commit-bridge template: mev-commit-bridge.nomad.j2 diff --git a/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 index ac2d7d461..c5330dde6 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 @@ -9,7 +9,7 @@ job "{{ job.name }}" { mode = "bridge" dns { - servers = {{ ansible_facts['dns']['nameservers'] | tojson }} + servers = {{ (ansible_facts['dns']['nameservers'] + ['1.1.1.1']) | tojson }} } {% for port_name, port_details in job.ports[0].items() %} @@ -57,13 +57,7 @@ job "{{ job.name }}" { {{- end }} {% endraw %} {% if job.target_type == 'bidder' %} - {%- raw %} - {{ range nomadService "mev-commit-geth-bootnode1" }} - {{- if contains "http" .Tags }} - EMULATOR_SETTLEMENT_RPC_ENDPOINT="http://{{ .Address }}:{{ .Port }}" - {{ end }} - {{ end }} - {% endraw %} + EMULATOR_L1_RPC_URL="{{ job.env['l1-rpc-url'] }}" {% endif %} EOH destination = "secrets/.env" @@ -86,7 +80,7 @@ job "{{ job.name }}" { ${EMULATOR_BINARY} \ -server-addr "${EMULATOR_IP_PORT}" \ {% if job.target_type == 'bidder' %} - -rpc-addr "${EMULATOR_SETTLEMENT_RPC_ENDPOINT}" \ + -rpc-addr "${EMULATOR_L1_RPC_URL}" \ {% endif %} EOH destination = "local/run.sh" diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index e0fa08f0f..99861288f 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -136,15 +136,15 @@ job "{{ job.name }}" { MEV_ORACLE_LOG_LEVEL="{{ job.env.get('log-level', 'info') }}" MEV_ORACLE_LAGGERD_MODE="{{ job.env.get('laggerd-mode', '20') }}" MEV_ORACLE_L1_RPC_URL="{{ job.env['l1-rpc-url'] }}" - {%- raw %} - # MEV_ORACLE_KEYSTORE_PATH="/local/data-{{env "NOMAD_ALLOC_INDEX"}}/keystore" - # MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" - MEV_ORACLE_PRIV_KEY_FILE = "/local/data-{{env "NOMAD_ALLOC_INDEX"}}/priv-key" MEV_ORACLE_PRECONF_CONTRACT_ADDR="{{ job.env['preconf-contract-address'] }}" MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR="{{ job.env['blocktracker-contract-address'] }}" MEV_ORACLE_ORACLE_CONTRACT_ADDR="{{ job.env['oracle-contract-address'] }}" MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR="{{ job.env['bidder-registry-contract-address'] }}" MEV_ORACLE_PROVIDERREGISTRY_CONTRACT_ADDR="{{ job.env['provider-registry-contract-address'] }}" + {%- raw %} + # MEV_ORACLE_KEYSTORE_PATH="/local/data-{{env "NOMAD_ALLOC_INDEX"}}/keystore" + # MEV_ORACLE_KEYSTORE_PASSWORD="{{ with secret "secret/data/mev-commit" }}{{ .Data.data.oracle_keystore_password }}{{ end }}" + MEV_ORACLE_PRIV_KEY_FILE = "/local/data-{{env "NOMAD_ALLOC_INDEX"}}/priv-key" {{- range nomadService "mev-commit-oracle" }} {{- if contains "http" .Tags }} MEV_ORACLE_HTTP_PORT="{{ .Port }}" From 242a57165c37608874b5ddb20383a145f90327ec Mon Sep 17 00:00:00 2001 From: Mikelle Date: Wed, 15 May 2024 00:07:38 +0200 Subject: [PATCH 09/11] fix: deleted comment for datadog logs --- infrastructure/nomad/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/nomad/deploy.yml b/infrastructure/nomad/deploy.yml index cd0fc51b4..1d0c20b29 100644 --- a/infrastructure/nomad/deploy.yml +++ b/infrastructure/nomad/deploy.yml @@ -17,7 +17,7 @@ profiles: devnet: job_names: - # - 'datadog-agent-logs-collector' + - "datadog-agent-logs-collector" - "mev-commit-geth-bootnode1" - "mev-commit-geth-signer-node1" - "mev-commit-geth-member-node" From 1ffd11435e7122c9cafb909e4f1e1d4567db4644 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Wed, 15 May 2024 00:51:46 +0200 Subject: [PATCH 10/11] fix: fixes after merge --- infrastructure/nomad/deploy.yml | 5 ----- .../nomad/templates/nomad/mev-commit-emulator.nomad.j2 | 2 +- infrastructure/nomad/vars.yml | 7 ++++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructure/nomad/deploy.yml b/infrastructure/nomad/deploy.yml index d47aa0f40..1bfd57fed 100644 --- a/infrastructure/nomad/deploy.yml +++ b/infrastructure/nomad/deploy.yml @@ -5,11 +5,6 @@ build: false datacenter: "dc1" aws_s3_bucket: "primev-infrastructure-artifacts" - preconf_contract_address: "0x2Aff805aBdF1Fe79AfcF8B3a9B4B45ECcD6b6D6e" - blocktracker_contract_address: "0x042744D8cF66d8455350D43F9e09CA73b5C0CB94" - oracle_contract_address: "0x77A4FE615de28fdf0bF68D9B9ba773A32b5C7630" - bidder_registry_contract_address: "0x1E218818D409E0f00dfeBE8A960F7585d4fDff70" - provider_registry_contract_address: "0x0332388390d9df01cA3d26269f2B1Fc314deD9c0" profiles: devnet: job_names: diff --git a/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 index c5330dde6..de5279628 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-emulator.nomad.j2 @@ -57,7 +57,7 @@ job "{{ job.name }}" { {{- end }} {% endraw %} {% if job.target_type == 'bidder' %} - EMULATOR_L1_RPC_URL="{{ job.env['l1-rpc-url'] }}" + EMULATOR_L1_RPC_URL="{{ job.env['l1_rpc_url'] }}" {% endif %} EOH destination = "secrets/.env" diff --git a/infrastructure/nomad/vars.yml b/infrastructure/nomad/vars.yml index b6e4a61c0..e76747320 100644 --- a/infrastructure/nomad/vars.yml +++ b/infrastructure/nomad/vars.yml @@ -7,6 +7,11 @@ server_common_name: "mev-commit_{{ env }}.mev-commit.primev.xyz" tls_crt_file: "{{ certificates_dir }}/{{ server_common_name }}.crt" tls_key_file: "{{ private_keys_dir }}/{{ server_common_name }}.key" tls_ca_crt_file: "{{ ca_certificates_dir }}/ca-{{ server_common_name }}.crt" +preconf_contract_address: "0x2Aff805aBdF1Fe79AfcF8B3a9B4B45ECcD6b6D6e" +blocktracker_contract_address: "0x042744D8cF66d8455350D43F9e09CA73b5C0CB94" +oracle_contract_address: "0x77A4FE615de28fdf0bF68D9B9ba773A32b5C7630" +bidder_registry_contract_address: "0x1E218818D409E0f00dfeBE8A960F7585d4fDff70" +provider_registry_contract_address: "0x0332388390d9df01cA3d26269f2B1Fc314deD9c0" jobs: - name: datadog-agent-logs-collector @@ -144,7 +149,7 @@ jobs: static: 8080 to: 8080 env: - l1-rpc-url: https://ethereum-holesky-rpc.publicnode.com + l1_rpc_url: https://ethereum-holesky-rpc.publicnode.com preconf_contract_address: "{{ preconf_contract_address }}" blocktracker_contract_address: "{{ blocktracker_contract_address }}" bidder_registry_contract_address: "{{ bidder_registry_contract_address }}" From 47e8d3ad6c43a3ed72ef547d3fdd232bf58f2050 Mon Sep 17 00:00:00 2001 From: Mikelle Date: Wed, 15 May 2024 12:59:00 +0200 Subject: [PATCH 11/11] chore: get rid of contracts hardcode --- contracts-abi/config/testnet.go | 10 ++++----- .../nomad/mev-commit-oracle.nomad.j2 | 5 ----- .../nomad/templates/nomad/mev-commit.nomad.j2 | 4 ---- infrastructure/nomad/vars.yml | 22 ------------------- 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/contracts-abi/config/testnet.go b/contracts-abi/config/testnet.go index 553abeb3e..eb74d2c07 100644 --- a/contracts-abi/config/testnet.go +++ b/contracts-abi/config/testnet.go @@ -9,9 +9,9 @@ type Contracts struct { } var TestnetContracts = Contracts{ - BidderRegistry: "0xded9029fC3789ED393D62686c0c0f9dfA92aA2f6", - ProviderRegistry: "0xFA19327bDBf2632aAB7C77e61DC69DbC872d5AC1", - PreconfCommitmentStore: "0x1F8989fAd5f0538D794Fd9fa15d50942F305f367", - Oracle: "0x1cB85eC90320Ef25FB4F991E41392f518980e53a", - BlockTracker: "0xCB4AA84C916BB891cBF43320e0c97C3d4329Cec7", + BidderRegistry: "0x1E218818D409E0f00dfeBE8A960F7585d4fDff70", + ProviderRegistry: "0x0332388390d9df01cA3d26269f2B1Fc314deD9c0", + PreconfCommitmentStore: "0x2Aff805aBdF1Fe79AfcF8B3a9B4B45ECcD6b6D6e", + Oracle: "0x77A4FE615de28fdf0bF68D9B9ba773A32b5C7630", + BlockTracker: "0x042744D8cF66d8455350D43F9e09CA73b5C0CB94", } diff --git a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 index 891923354..13bc48dbe 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit-oracle.nomad.j2 @@ -134,11 +134,6 @@ job "{{ job.name }}" { else 'service:' + job.name + '-{{ env "NOMAD_ALLOC_INDEX" }}' }}" MEV_ORACLE_LOG_LEVEL="{{ job.env.get('log-level', 'info') }}" - MEV_ORACLE_PRECONF_CONTRACT_ADDR="{{ job.env['preconf_contract_address'] }}" - MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR="{{ job.env['blocktracker_contract_address'] }}" - MEV_ORACLE_ORACLE_CONTRACT_ADDR="{{ job.env['oracle_contract_address'] }}" - MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR="{{ job.env['bidder_registry_contract_address'] }}" - MEV_ORACLE_PROVIDERREGISTRY_CONTRACT_ADDR="{{ job.env['provider_registry_contract_address'] }}" MEV_ORACLE_LAGGERD_MODE="{{ job.env.get('laggerd-mode', '20') }}" MEV_ORACLE_L1_RPC_URL="{{ job.env['l1_rpc_url'] }}" {%- raw %} diff --git a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 index 33776e16f..30ce395a0 100644 --- a/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 +++ b/infrastructure/nomad/templates/nomad/mev-commit.nomad.j2 @@ -76,10 +76,6 @@ job "{{ job.name }}" { MEV_COMMIT_P2P_ADDR="{{ job.env.get('p2p-address', '0.0.0.0') }}" MEV_COMMIT_SERVER_TLS_CERTIFICATE="{{ job.env['tls_crt_file'] }}" MEV_COMMIT_SERVER_TLS_PRIVATE_KEY="{{ job.env['tls_key_file'] }}" - MEV_COMMIT_PROVIDER_REGISTRY_ADDR="{{ job.env.get('provider_registry_contract_address') }}" - MEV_COMMIT_BIDDER_REGISTRY_ADDR="{{ job.env.get('bidder_registry_contract_address') }}" - MEV_COMMIT_PRECONF_ADDR="{{ job.env.get('preconf_contract_address') }}" - MEV_COMMIT_BLOCK_TRACKER_ADDR="{{ job.env.get('blocktracker_contract_address') }}" {% if job.env['type'] == 'provider' %} MEV_COMMIT_NAT_ADDR="{{ job.env['nat_address'] }}" {%- raw %} diff --git a/infrastructure/nomad/vars.yml b/infrastructure/nomad/vars.yml index e76747320..27cdc0306 100644 --- a/infrastructure/nomad/vars.yml +++ b/infrastructure/nomad/vars.yml @@ -7,11 +7,6 @@ server_common_name: "mev-commit_{{ env }}.mev-commit.primev.xyz" tls_crt_file: "{{ certificates_dir }}/{{ server_common_name }}.crt" tls_key_file: "{{ private_keys_dir }}/{{ server_common_name }}.key" tls_ca_crt_file: "{{ ca_certificates_dir }}/ca-{{ server_common_name }}.crt" -preconf_contract_address: "0x2Aff805aBdF1Fe79AfcF8B3a9B4B45ECcD6b6D6e" -blocktracker_contract_address: "0x042744D8cF66d8455350D43F9e09CA73b5C0CB94" -oracle_contract_address: "0x77A4FE615de28fdf0bF68D9B9ba773A32b5C7630" -bidder_registry_contract_address: "0x1E218818D409E0f00dfeBE8A960F7585d4fDff70" -provider_registry_contract_address: "0x0332388390d9df01cA3d26269f2B1Fc314deD9c0" jobs: - name: datadog-agent-logs-collector @@ -101,10 +96,6 @@ jobs: type: bootnode tls_crt_file: "{{ tls_crt_file }}" tls_key_file: "{{ tls_key_file }}" - preconf_contract_address: "{{ preconf_contract_address }}" - blocktracker_contract_address: "{{ blocktracker_contract_address }}" - bidder_registry_contract_address: "{{ bidder_registry_contract_address }}" - provider_registry_contract_address: "{{ provider_registry_contract_address }}" - name: mev-commit-provider-node1 template: mev-commit.nomad.j2 @@ -127,10 +118,6 @@ jobs: nat_address: "{{ ansible_facts['default_ipv4']['address'] }}" tls_crt_file: "{{ tls_crt_file }}" tls_key_file: "{{ tls_key_file }}" - preconf_contract_address: "{{ preconf_contract_address }}" - blocktracker_contract_address: "{{ blocktracker_contract_address }}" - bidder_registry_contract_address: "{{ bidder_registry_contract_address }}" - provider_registry_contract_address: "{{ provider_registry_contract_address }}" - name: mev-commit-provider-node1-funder template: mev-commit-funder.nomad.j2 @@ -150,11 +137,6 @@ jobs: to: 8080 env: l1_rpc_url: https://ethereum-holesky-rpc.publicnode.com - preconf_contract_address: "{{ preconf_contract_address }}" - blocktracker_contract_address: "{{ blocktracker_contract_address }}" - bidder_registry_contract_address: "{{ bidder_registry_contract_address }}" - provider_registry_contract_address: "{{ provider_registry_contract_address }}" - oracle_contract_address: "{{ oracle_contract_address }}" - name: mev-commit-bidder-node1 template: mev-commit.nomad.j2 @@ -176,10 +158,6 @@ jobs: type: bidder tls_crt_file: "{{ tls_crt_file }}" tls_key_file: "{{ tls_key_file }}" - preconf_contract_address: "{{ preconf_contract_address }}" - blocktracker_contract_address: "{{ blocktracker_contract_address }}" - bidder_registry_contract_address: "{{ bidder_registry_contract_address }}" - provider_registry_contract_address: "{{ provider_registry_contract_address }}" - name: mev-commit-bidder-node1-funder template: mev-commit-funder.nomad.j2