Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: verify l1 gateway #519

Merged
merged 3 commits into from
Dec 11, 2024
+30 −11
Merged

chore: verify l1 gateway #519

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
6a7fac8
verify l1 gateway
shaspitz Dec 5, 2024
7c5e72c
fix: add etherscan_api_key to profiles.yml
mrekucci Dec 10, 2024
667d6d5
fix: use verify option only when the etherscan key exists
mrekucci Dec 11, 2024
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
5 changes: 5 additions & 0 deletions contracts/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ KEYSTORE_FILENAME=${KEYSTORE_FILENAME:-*}
KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-"pwd"}
CONTRACT_REPO_ROOT_PATH=${CONTRACT_REPO_ROOT_PATH:-$PWD}

if [ -n "${ETHERSCAN_API_KEY}" ]; then
VERIFY_OPTION="--verify"
fi

if [ "${DEPLOY_TYPE}" = "core" ]; then
if [ -z "$ORACLE_KEYSTORE_ADDRESS" ]; then
echo "ORACLE_KEYSTORE_ADDRESS not specified"
Expand Down Expand Up @@ -65,5 +69,6 @@ elif [ "${DEPLOY_TYPE}" = "l1-gateway" ]; then
--use 0.8.26 \
--broadcast \
--json \
${VERIFY_OPTION} \
--via-ir
fi
34 changes: 23 additions & 11 deletions infrastructure/nomad/cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ environment_name="devenv"
profile_name="devnet"
datadog_key=""
l1_rpc_urls="mock"
etherscan_api_key=""
otel_collector_endpoint_url=""
genesis_file_url=""
geth_bootnode_url=""

help() {
echo "Usage:"
echo "$0 [init [--environment <name=devenv>] [--skip-certificates-setup] [--debug]]"
echo "$0 [deploy [version=HEAD] [--environment <name=devenv>] [--profile <name=devnet>] [--force-build-templates] [--no-logs-collection] [--datadog-key <key>] [--l1-rpc-urls <urls>] [--otel-collector-endpoint-url <url>] [--genesis-file-url <url>] [--geth-bootnode-url <url>] [--release] [--debug]]"
echo "$0 [deploy [version=HEAD] [--environment <name=devenv>] [--profile <name=devnet>] [--force-build-templates] [--no-logs-collection] [--datadog-key <key>] [--l1-rpc-urls <urls>] [--etherscan-api-key <key>] [--otel-collector-endpoint-url <url>] [--genesis-file-url <url>] [--geth-bootnode-url <url>] [--release] [--debug]]"
echo "$0 [destroy [--environment <name=devenv>] [--debug]]"
echo "$0 --help"
echo
Expand All @@ -33,15 +34,16 @@ help() {
echo " --debug Enable debug mode for detailed output."
echo
echo " deploy [version=HEAD] Deploy the specified artifact version (a git commit hash or an existing AWS S3 tag). If not specified or set to HEAD, a local build is triggered."
echo " --environment <name=devenv>] Specify the environment to use (default is devenv)."
echo " --profile <name=devnet>] Specify the profile to use (default is devnet)."
echo " --environment <name=devenv> Specify the environment to use (default is devenv)."
echo " --profile <name=devnet> Specify the profile to use (default is devnet)."
echo " --force-build-templates Force the build of all job templates before deployment."
echo " --no-logs-collection Disable the collection of logs from deployed jobs."
echo " --datadog-key <key>] Datadog API key, cannot be empty."
echo " --l1-rpc-urls <urls>] Comma separated list of L1 RPC URLs, cannot be empty."
echo " --otel-collector-endpoint-url <url>] OpenTelemetry Collector Endpoint URL, cannot be empty."
echo " --genesis-file-url <url>] URL to the genesis file, cannot be empty."
echo " --geth-bootnode-url <url>] URL to the Geth bootnode, cannot be empty."
echo " --datadog-key <key> Datadog API key, cannot be empty."
echo " --l1-rpc-urls <urls> Comma separated list of L1 RPC URLs, cannot be empty."
echo " --etherscan-api-key <key> Etherscan API key, cannot be empty."
echo " --otel-collector-endpoint-url <url> OpenTelemetry Collector Endpoint URL, cannot be empty."
echo " --genesis-file-url <url> URL to the genesis file, cannot be empty."
echo " --geth-bootnode-url <url> URL to the Geth bootnode, cannot be empty."
echo " --release It will ignore the specified deployment version and use the current HEAD tag as the build version."
echo " --debug Enable debug mode for detailed output."
echo
Expand All @@ -61,7 +63,7 @@ help() {
usage() {
echo "Usage:"
echo "$0 [init [--environment <name=devenv>] [--skip-certificates-setup] [--debug]]"
echo "$0 [deploy [version=HEAD] [--environment <name=devenv>] [--profile <name=devnet>] [--force-build-templates] [--no-logs-collection] [--datadog-key <key>] [--l1-rpc-urls <urls>] [--otel-collector-endpoint-url <url>] [--genesis-file-url <url>] [--geth-bootnode-url <url>] [--release] [--debug]]"
echo "$0 [deploy [version=HEAD] [--environment <name=devenv>] [--profile <name=devnet>] [--force-build-templates] [--no-logs-collection] [--datadog-key <key>] [--l1-rpc-urls <urls>] [--etherscan-api-key <key>] [--otel-collector-endpoint-url <url>] [--genesis-file-url <url>] [--geth-bootnode-url <url>] [--release] [--debug]]"
echo "$0 [destroy [--environment <name=devenv>] [--debug]]"
echo "$0 --help"
exit 1
Expand Down Expand Up @@ -123,8 +125,8 @@ check_deps() {
parse_args() {
while [[ $# -gt 0 ]]; do
if $init_flag || $deploy_flag || $destroy_flag; then
echo "Error: Only one of 'init', 'deploy', or 'destroy' can be specified."
usage
echo "Error: Only one of 'init', 'deploy', or 'destroy' can be specified."
usage
fi

key="$1"
Expand Down Expand Up @@ -201,6 +203,15 @@ parse_args() {
usage
fi
fi
if [[ $# -gt 0 && $1 == "--etherscan-api-key" ]]; then
if [[ $# -gt 1 && ! $2 =~ ^-- ]]; then
etherscan_api_key="$2"
shift 2
else
echo "Error: --etherscan-api-key requires a value."
usage
fi
fi
if [[ $# -gt 0 && $1 == "--otel-collector-endpoint-url" ]]; then
if [[ $# -gt 1 && ! $2 =~ ^-- ]]; then
otel_collector_endpoint_url="$2"
Expand Down Expand Up @@ -293,6 +304,7 @@ main() {
[[ "${force_build_templates_flag}" == true ]] && flags+=("--extra-vars" "build_templates=true")
[[ -n "${datadog_key}" ]] && flags+=("--extra-vars" "datadog_key=${datadog_key}")
[[ -n "${l1_rpc_urls}" ]] && flags+=("--extra-vars" "l1_rpc_urls=${l1_rpc_urls}")
[[ -n "${etherscan_api_key}" ]] && flags+=("--extra-vars" "etherscan_api_key=${etherscan_api_key}")
[[ -n "${otel_collector_endpoint_url}" ]] && flags+=("--extra-vars" "otel_collector_endpoint_url=${otel_collector_endpoint_url}")
[[ -n "${genesis_file_url}" ]] && flags+=("--extra-vars" "genesis_file_url=${genesis_file_url}")
[[ -n "${geth_bootnode_url}" ]] && flags+=("--extra-vars" "geth_bootnode_url=${geth_bootnode_url}")
Expand Down
1 change: 1 addition & 0 deletions infrastructure/nomad/playbooks/templates/jobs/contracts-deployer.nomad.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ job "{{ job.name }}" {
{% if profile == 'testnet' %}
export RPC_URL="{{ job.env['l1_rpc_url'] }}"
export CHAIN_ID="17000"
export ETHERSCAN_API_KEY="{{ job.env['etherscan_api_key'] }}"
{% endif %}

{%- raw %}
Expand Down
1 change: 1 addition & 0 deletions infrastructure/nomad/playbooks/variables/profiles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ jobs:
env:
chain-id: "{{ environments[env].chain_id }}"
l1_rpc_url: "{{ resolved_l1_rpc_urls.split(',')[0] }}"
etherscan_api_key: "{{ (etherscan_api_key) if env == 'testnet' else '' }}"

mev_commit_dashboard: &mev_commit_dashboard_job
name: mev-commit-dashboard
Expand Down
Loading