From ee35b24dfc2c60077a0e584f23943ea24ebf80a5 Mon Sep 17 00:00:00 2001 From: "jonathan@vulcanize.io" Date: Tue, 12 Mar 2024 17:00:16 +0000 Subject: [PATCH] working but still with optimum connection issues --- .../data/compose/docker-compose-blast.yml | 12 ++++--- .../data/stacks/blast/deploy/commands.py | 33 +++++++++---------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/stack_orchestrator/data/compose/docker-compose-blast.yml b/stack_orchestrator/data/compose/docker-compose-blast.yml index 0c9672ae..be7c2a14 100644 --- a/stack_orchestrator/data/compose/docker-compose-blast.yml +++ b/stack_orchestrator/data/compose/docker-compose-blast.yml @@ -59,15 +59,17 @@ services: image: blastio/blast-optimism:${NETWORK:-mainnet} volumes: - blast-data:/blast + - ../config/blast/genesis.json:/blast/genesis.json + - ../config/blast/rollup.json:/blast/rollup.json ports: - "9003" command: > - op-node - --l1="https://eth-mainnet-1.vdb.to/" - --l1.rpckind="any" - --l2="http://blast-geth:8551" + sh -c "pwd; ls /blast -lah; head /blast/genesis.json; exec op-node + --l1='https://eth-mainnet-1.vdb.to/' + --l1.rpckind='any' + --l2='http://blast-geth:8551' --l2.jwt-secret=/blast/jwt.txt - --rollup.config="/blast/rollup.json" + --rollup.config='/blast/rollup.json'" depends_on: - blast-geth env_file: diff --git a/stack_orchestrator/data/stacks/blast/deploy/commands.py b/stack_orchestrator/data/stacks/blast/deploy/commands.py index e09f28ab..e6e1c7bf 100644 --- a/stack_orchestrator/data/stacks/blast/deploy/commands.py +++ b/stack_orchestrator/data/stacks/blast/deploy/commands.py @@ -1,17 +1,17 @@ -# Copyright © 2023 Vulcanize +# # Copyright © 2023 Vulcanize -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# # This program is free software: you can redistribute it and/or modify +# # it under the terms of the GNU Affero General Public License as published by +# # the Free Software Foundation, either version 3 of the License, or +# # (at your option) any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. +# # This program is distributed in the hope that it will be useful, +# # but WITHOUT ANY WARRANTY; without even the implied warranty of +# # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# # GNU Affero General Public License for more details. -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# # You should have received a copy of the GNU Affero General Public License +# # along with this program. If not, see . from pathlib import Path @@ -19,12 +19,11 @@ from shutil import copy def create(context, extra_args): - # Our goal here is just to copy the json files for blast - deployment_config_dir = context.deployment_dir.joinpath("data", "blast-data") + deployment_config_dir = context.deployment_dir.joinpath("config", "blast") + print("deploy", deployment_config_dir) command_context = extra_args[2] compose_file = [f for f in command_context.cluster_context.compose_files if "blast" in f][0] - source_config_file = Path(compose_file).parent.parent.joinpath("config", "blast", "genesis.json") - copy(source_config_file, deployment_config_dir) - source_config_file = Path(compose_file).parent.parent.joinpath("config", "blast", "rollup.json") - copy(source_config_file, deployment_config_dir) + print("compose", Path(compose_file).parent.parent) + genesis_config_file = Path(compose_file).parent.parent.joinpath("config", "blast", "genesis.json") + copy(genesis_config_file, deployment_config_dir) \ No newline at end of file