Skip to content

Commit

Permalink
fix: rollup boost plan errors (ethpandaops#147)
Browse files Browse the repository at this point in the history
rollup boost nightly build is failing due to plan errors from merge /
rebase issues
  • Loading branch information
zhwrd authored Feb 11, 2025
1 parent 1887774 commit 069b11d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/cl/op-node/op_node_builder_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def get_beacon_config(
"labels": ethereum_package_shared_utils.label_maker(
client=constants.CL_TYPE.op_node,
client_type=constants.CLIENT_TYPES.cl,
image=participant.cl_builder_image[-constants.MAX_LABEL_LENGTH :],
image=util.label_from_image(participant.cl_builder_image),
connected_client=el_context.client_name,
extra_labels=participant.cl_builder_extra_labels,
),
Expand Down
6 changes: 5 additions & 1 deletion src/el/op-geth/op_geth_builder_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ ethereum_package_constants = import_module(

constants = import_module("../../package_io/constants.star")

util = import_module("../../util.star")

RPC_PORT_NUM = 8545
WS_PORT_NUM = 8546
DISCOVERY_PORT_NUM = 30303
Expand Down Expand Up @@ -104,6 +106,8 @@ def launch(
existing_el_clients,
sequencer_enabled,
sequencer_context,
observability_helper,
interop_params,
):
log_level = ethereum_package_input_parser.get_client_log_level_or_default(
participant.el_builder_log_level, global_log_level, VERBOSITY_LEVELS
Expand Down Expand Up @@ -260,7 +264,7 @@ def get_config(
"labels": ethereum_package_shared_utils.label_maker(
client=constants.EL_TYPE.op_geth,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_builder_image[-constants.MAX_LABEL_LENGTH :],
image=util.label_from_image(participant.el_builder_image),
connected_client=cl_client_name,
extra_labels=participant.el_builder_extra_labels,
),
Expand Down
4 changes: 3 additions & 1 deletion src/el/op-reth/op_reth_builder_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ethereum_package_input_parser = import_module(

constants = import_module("../../package_io/constants.star")

util = import_module("../../util.star")

RPC_PORT_NUM = 8545
WS_PORT_NUM = 8546
DISCOVERY_PORT_NUM = 30303
Expand Down Expand Up @@ -233,7 +235,7 @@ def get_config(
"labels": ethereum_package_shared_utils.label_maker(
client=constants.EL_TYPE.op_reth,
client_type=constants.CLIENT_TYPES.el,
image=participant.el_builder_image[-constants.MAX_LABEL_LENGTH :],
image=util.label_from_image(participant.el_builder_image),
connected_client=cl_client_name,
extra_labels=participant.el_builder_extra_labels,
),
Expand Down
3 changes: 1 addition & 2 deletions static_files/scripts/fund.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ write_keyfile() {
}

send() {
cast send $1 --value "$FUND_VALUE" --private-key "$FUND_PRIVATE_KEY" --timeout 60 --nonce "$nonce" &
cast send $1 --value "$FUND_VALUE" --private-key "$FUND_PRIVATE_KEY" --timeout 60 --nonce "$nonce" --priority-gas-price 1gwei &
nonce=$((nonce+1))
}

Expand All @@ -47,7 +47,6 @@ for chain_id in "${chain_ids[@]}"; do

for index in "${!roles[@]}"; do
role="${roles[$index]}"
role_idx=$((index+1))

write_keyfile "${deployer_addr}" "${DEPLOYER_PRIVATE_KEY}" "${role}-$chain_id"

Expand Down

0 comments on commit 069b11d

Please sign in to comment.